Correct counters updating when saving