Fixed optimization of highlight drawing.