Fix code to enable highlighting