Bug that caused a segfault removed.