Fix for defense/attack bug