Fixed uuid bug