Yes, the definition of APS applies to all of the rumbles.
I think I've solved this now, it looks like the problem was with the way I was generating battles.
