Try to fix segmentation faults