Fix map() usage with list()