Adjust uuid check