BUG: switched from map to list comprehension (Py3)