fix scrolling bugz
Merge branch 'fix_scrolling'