Fixed messed up highlight