When present fix in helper steps