added uuid check