Fix for 64-bit segfault