Index: AXimpl/Admin/Common/HerverpakteSoprService.cls.xml
===================================================================
diff -u -r51079 -r51082
--- AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51079)
+++ AXimpl/Admin/Common/HerverpakteSoprService.cls.xml	(.../HerverpakteSoprService.cls.xml)	(revision 51082)
@@ -3,6 +3,11 @@
 <Class name="AXimpl.Admin.Common.HerverpakteSoprService">
 <Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
+<Property name="InputProductId">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KindSoprProductId">
 <Type>%String</Type>
 <Private>1</Private>
@@ -49,6 +54,7 @@
 	#dim SoprKindProductId As %String = ""
 	#dim KindSoprProductId As %String = ""
 	
+	Set ..InputProductId = ProductId
 	Set ..KindSoprProductId = ""
 	If (..ProductRolApi.BestaatAdministratiefProduct(ProductId)) {
 		If (..ProductRolApi.IsSamengesteldProduct(ProductId)) {
@@ -77,7 +83,9 @@
 <FormalSpec>ProductId:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit:($$$HasLength(..KindSoprProductId)) ..KindSoprProductId
+	If (..InputProductId = ProductId) {
+		Quit:($$$HasLength(..KindSoprProductId)) ..KindSoprProductId
+	}
 	
 	Do ..IsHerverpakteSopr(ProductId)