Fix retrying