Fixing iterator bug from last commit. Version 1.2 / 3.