Add hacky retry logic