Heri & Sophie | #2760 & 2761 | Adjusting counters incrementation