work around for collections with more than 1000 items; closes #807
Merge branch 'hotfix-1.4.2'