clean + fix counter