should fix newly introduced bugs wrt TR macros