I think you can get around this by autoresolving the battle.