Patch for remote upload. Bug is not identified yet.