Feature/fix counters