BugFix Segmentation Fault