Segmentation fault removed