- Fixed iterator bug