Fixed the UUID issue