fixup  1cadaa1, changed api of map