KAZOO-1770: Fix to use items instead of "guessing"