Fix solution (place highlighting above coloring)