bugfix for highlight bug