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 f9f01a1..c40fbae 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
@@ -134,7 +134,8 @@ public final class ContextImpl extends EntityElementImpl implements Context {
 	
 	@Override
 	public void addChild(IsParentOf isParentOf) {
-		((ContextImpl) isParentOf.getTarget()).setParent(this);
+		// ((ContextImpl) isParentOf.getTarget()).setParent(this);
+		isParentOf.setSource(this);
 		children.add(isParentOf);
 	}