Fixing highlights