Should we be using `self.tap_next()` here?