Removed segmentation fault