Fix for missing nuid in factory