TR bug fix