Solves conflicting behaviours between classes depending on tbb.

See more here: https://indico.cern.ch/event/607814/contributions/2466931/attachments/1409778/2155811/TScheduler.pdf