Fix the TAP

Fix the TAP