Replace map with for. For #67