Fixed map, now works in Mozilla and ECMA.