fixed more tbag stuff
Merge branch 'hotfix/tbag'