Solve a potential bug with UUIDs