Fixing the code highlights 2