Add retry as a work around for #51