added patch to fix highlighting