Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r713 -r789
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 713)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 789)
@@ -66,15 +66,25 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim HasToUpdateMock As %Boolean = 0
-	set HasToUpdateMock = 	(..Class.Abstract) && 
-		 					( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"TECH.Interface") ) && 
-		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"TECH.Template") ) ) && 
+	set HasToUpdateMock = 	(..Class.Abstract) && ( ..DerivesFromCorrectInterface(..Class.Name)) && 		 					
+							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"TECH.Template") ) ) && 
 		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(..Class.Name,"%Library.Base") ) )
 		 					
 	quit HasToUpdateMock
 ]]></Implementation>
 </Method>
 
+<Method name="DerivesFromCorrectInterface">
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim DerivesFromCorrectInterface As %Boolean = ##class(TECH.ClassUtils).ClassDerivesFrom(ClassName,"TECH.Interface")
+	if 'DerivesFromCorrectInterface set DerivesFromCorrectInterface = ##class(TECH.ClassUtils).ClassDerivesFrom(ClassName,"TECH.InternalInterface")
+	quit DerivesFromCorrectInterface
+]]></Implementation>
+</Method>
+
 <Method name="CreateMethod">
 <FormalSpec>Method:%Dictionary.MethodDefinition</FormalSpec>
 <Private>1</Private>