Fixing highlighting