Possible fix to TBITask generation...