Fixed Segmentation
Fixing merge issues