Updated for TBB problem