fix: tr.588 (from master)