Server segfault fix