crash issue fixed