Fixing remove highlight