Add a waitUntil to have a deterministic behavior