Fixed UUID string issue