Fixed sigfault