Do we need a wait before the `tap` here?