Fixed separate segfault