UUID issue resolved