Fixed Crashes.