this can be changed to `tap()` , I tested it!
I also resolved the bug