Blocking .wait() should be optional