Patched wait for id