fix scroll
Merge branch 'release/scroll-fix'