Fixes class add and remove for counter