switched to utils.map for compatibility