Fixed that damn crashing