Fixed one of Segmentation Faults..