Fix battle song handling code