Fixing the conflicts with TNet.