Scrolling bug fix