Fixed uuid patch