and fixed once more in battle.java