Fixed segmentation fault
Fixed segmentation fault