Changed retry strategy