THINK-213-TRN

Bugfix THINK-213-TRN