Fix up retry interface, thanks @boj