Fix evil nasty bug of death