Fixed bug with highlight