Fixed Crash issue