Reversed segfault fix as it was already fixed