Crash fix, version 69 (heh)