Add fallback in uploader