Fixing endhighlight issue