Fix UUID checking