Fixed patch for uuid