#343 Correct fix for infinite scroller