ADD: wait only if should be waited