Quick hack for retry