fixup wait for map