Wait should not depend on Time (#228)