Fix Mismatched TRs

In fixing one issue with mismatched TRs I caused another. Special thanks to @keesiemeijer for the kind PR, the problem is now fixed complete with regression tests to prevent the problem from creeping up in the future.