Fix for failing some test cases in tranform