Crash issue fixed