fixed Iterator.map