fixing UUID stuff