Fix uuid bug