Fixing UUID