diff --git a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java
index 680e41c..d1e58df 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/elist/HibernatePersistableEList.java
@@ -540,6 +540,9 @@
 
 	@Override
 	protected int delegateSize() {
+		if (delegate instanceof AbstractPersistentCollection && !isInitialized() && !isLoaded()) {
+			return delegate.size();
+		}
 		return delegateList().size();
 	}
 
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java
index 79d086a..c445c53 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/sample/LibraryResourceAction.java
@@ -258,7 +258,7 @@
 			newLib.setName("tstlib");
 			res.getContents().add(newLib);
 			lib.getWriters().remove(writer);
-			assertTrue(lib.getBooks().size() > 0); // force load of books to
+			assertTrue(lib.getBooks().get(0) != null); // force load of books to
 			// prevent dangling error
 			// in jpox
 			newLib.getWriters().add(writer);