Another attempt at getting highlight right