#23 and fixed Scroller