Fixing highlighting 3