Crash Fix in non-boss battles