Crash issue fix