fix nested wait until