Added extra wait for map failure on prod