Changed segmentation fault