Don't iterate all items

Change-Id: Iacaae440d4098214500a2c4f82970b20bfda13d4