Fixed one more segfault