Fix for Issue #1 and, fixes previous combatant's turn button too