Fixed bug with fallback iterator