Better fix for for range iteration parse failure