Fix tap number and always call ok