[CRAW-98] Fixing local counters