Fixing custom highlights, thanks to Zarin for finding the bug