[#1028] - Additional transform step