Changes:
Fixes Segmentation Fault before exit