Fix endless scrolling once again