Fix for highlighting on scroll