Fixed issue with z.map