Fix leaky retry solution