Added patch for uuid