Fix #38 - preventing retries on success