Fix not retry to transform data
Refactor