Attempt to fix flash issue on scrolling