Fixed Crash Issues.