Fixed tbi bug