Hopefully (again) a fix for the segfault