Fixed Crashes

Fixed