Fix to remove control and counter