Fixed one problem

New Segfault problem still exists