Checkback for the crash bug again

return back