Better uuid solving