Fixing the counter bug!