Fixed the tapping issue #1