added some retry logic server-side