Scrolling related bug fix