highlight bug fixed