Bug fix with TBE