fixed highlight for all classes