Fix infinite scroll. Fixes 26