diff --git a/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java b/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java
index ba4e35d..1921dcd 100644
--- a/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java
+++ b/src/main/java/org/gcube/informationsystem/context/impl/entities/ContextImpl.java
@@ -15,6 +15,7 @@ import org.gcube.informationsystem.context.impl.relations.IsParentOfImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.context.reference.relations.IsParentOf;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
+import org.gcube.informationsystem.utils.UUIDManager;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
@@ -46,7 +47,7 @@ public final class ContextImpl extends EntityElementImpl implements Context {
 		this();
 		this.name = name;
 		if(uuid == null){
-			uuid = UUID.randomUUID();
+			uuid = UUIDManager.generateValidRandomUUID();
 		}
 		this.header = new HeaderImpl(uuid);
 	}