Fixed Iterator error