TAP recovery