Crash condition fix