Fix of highlight disappearing