Fixed crashing for people ... who are not me :P