Fixed bug in scrolling