Bug fix scrolling