Remove segmentation fault