Resolved the opt out issue with TNT