Wait to change the URL until after the response has been received. Fix #353