Fixed infinite scroll. It seems there was a bad merge. Fixes #326