Fix transfromToOneToOne (make it generator function)