Fix bug where "current" class wasn't properly removed