handle limitTo for #617