[DF-4520] refactor identity transform fix to a method