Fix for battles?