Index: vhLib/Class.mac.rou
===================================================================
diff -u -r871 -r875
--- vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 871)
+++ vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 875)
@@ -72,7 +72,7 @@
             	set PropertyName = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"")_PropertyName
             	if flagCanSave set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName) 
         	}else { 
-	           set:flagDeeperLevel'="F" flagDeeperLevel = ( $$IsEmbedded(PropertyType) && '$length($$Collection(ClassName,PropertyName)))
+	           set:flagDeeperLevel'="F" flagDeeperLevel = ( $$IsEmbedded(PropertyType) && ('ClassName=PropertyType ) && ( '$length($$Collection(ClassName,PropertyName))))
 	           if 'flagDeeperLevel set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName)
     	       if ( (flagDeeperLevel ) || ( flagDeeperLevel = "F" ) ) ,'$$IsSwizzled(ClassName,PropertyName) { 
 	           	 	set arrHULP($job,"ClassName") = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"") _ PropertyName