Fixed highlight bug