Why don't you just put this wait in the `tap_next` method?