Fixed counter bugs
Merge remote-tracking branch 'origin/counter-fixes'