Actually fixed the segfault?