Fix #2 scrolling