Fix highlights