Fixed another segfault...