Fixing the Higlights overlap bug