Fixed bug on scrolling