Get rid of stupid state setting of counter