X-Git-Url: http://nitlanguage.org

diff --git a/src/modelize_class.nit b/src/modelize_class.nit
index 2fa2628..87d28d1 100644
--- a/src/modelize_class.nit
+++ b/src/modelize_class.nit
@@ -163,7 +163,11 @@ redef class ModelBuilder
 
 		if nclassdef isa AStdClassdef then
 			var ndoc = nclassdef.n_doc
-			if ndoc != null then mclassdef.mdoc = ndoc.to_mdoc
+			if ndoc != null then
+				var mdoc = ndoc.to_mdoc
+				mclassdef.mdoc = mdoc
+				mdoc.original_mentity = mclassdef
+			end
 		end
 
 		if mclassdef.is_intro then
@@ -277,8 +281,7 @@ redef class ModelBuilder
 		if errcount != toolcontext.error_count then return
 
 		# Create the mclassdef hierarchy
-		for nclassdef in nmodule.n_classdefs do
-			var mclassdef = nclassdef.mclassdef.as(not null)
+		for mclassdef in mmodule.mclassdefs do
 			mclassdef.add_in_hierarchy
 		end