Fixed waitUntil