diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java
index 9b91d99..e4d82a8 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java
@@ -306,8 +306,8 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
 	public boolean internalAddToContext() throws ContextException, ResourceRegistryException {
 		try {
 			boolean ret = reallyAddToContext();
-			HeaderUtility.updateModifiedByAndLastUpdate(element);
-			((OrientVertex) element).save();
+			HeaderUtility.updateModifiedByAndLastUpdate(getElement());
+			((OrientElement) getElement()).save();
 			return ret && true;
 		}catch (ResourceRegistryException e) {
 			throw e;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java
index 2748cd5..13559e7 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/entity/EntityManagement.java
@@ -178,7 +178,7 @@ public abstract class EntityManagement<E extends Entity> extends
 
 		ContextUtility.addToActualContext(orientGraph, getElement());
 
-		Iterable<Edge> edges = element.getEdges(Direction.OUT);
+		Iterable<Edge> edges = getElement().getEdges(Direction.OUT);
 
 		for (Edge edge : edges) {
 			@SuppressWarnings("rawtypes")