Fix Upload and Download