fixed problem with short uuid