Added compatibility with endless scrolling