diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
index a116954b5a4d7eb94cb838b94182ea8aa0e64193..8e360111ca29e1533ce2b29ed490c8bb3d5d1b2e 100644
--- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
+++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/.ratings
@@ -1 +1 @@
-ModelElementLibraryService.java ad618d79106b45f9b63856023a1df1ab65f2cec7 GREEN
+ModelElementLibraryService.java aae1cda83bd706a5798169daa4a64db5be0a0588 YELLOW
diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
index ad618d79106b45f9b63856023a1df1ab65f2cec7..aae1cda83bd706a5798169daa4a64db5be0a0588 100644
--- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
+++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/library/ModelElementLibraryService.java
@@ -141,7 +141,8 @@ public class ModelElementLibraryService implements ILibraryService {
 			final ILibraryElementReference elementRef) {
 		IHierarchicElement wrapped = (IHierarchicElement)elementRef.getLibraryElementShadow();
 		IHierarchicElement container = (IHierarchicElement)elementRef.eContainer();
-		container.getContainedElements().remove(elementRef);
+		IHierarchicElement elementRefHierarchicElement = (IHierarchicElement)elementRef;
+		container.getContainedElements().remove(elementRefHierarchicElement);
 
 		// preserve the ID of the reference
 		((IIdLabeled)wrapped).setId(((IIdLabeled)elementRef).getId());
@@ -151,7 +152,7 @@ public class ModelElementLibraryService implements ILibraryService {
 		wrappedConnectorsList.addAll(wrapped.getConnectors());
 		wrapped.getConnectors().clear();
 		EList<IConnector> elementRefConnectorsList = new BasicEList<IConnector>();
-		elementRefConnectorsList.addAll(((IHierarchicElement)elementRef).getConnectors());
+		elementRefConnectorsList.addAll(elementRefHierarchicElement.getConnectors());
 		for(IConnector elemRefConnector : elementRefConnectorsList) {
 			wrapped.getConnectors().add(elemRefConnector);
 			String elementRefConnectorName = ((INamedElement)elemRefConnector).getName();