Merge "Fix segfault."