Crash bug FINALLY nixed