fix: tr.#666: factorize