Scroll bug fix