Joy v 2.5.1.6: Counter Batch Fix