Fixed #1 - Counters update correctly now