issue #2305: Using the old logic of "wait".