fixed attack and defend issues