Removing highlight flicker