Re-fix the segmentation fault.