Fix highlights again