1.1 Fixed retry funcion