Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r72870 -r72876
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72870)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72876)
@@ -558,8 +558,7 @@
 	
 	If ($$$Not(OrderLine.CID = "{00000000-0000-0000-0000-000000000000}") && $$$Not(OrderLine.CID = "")) {
 		Set CID = ##class(TECH.StringUtils).Replace(##class(TECH.StringUtils).Replace(OrderLine.CID, "}", ""), "{", "")
-		Do ..VhConfigRepository.SaveVhConfig(OrderLine.CID, OrderLine.VhConfig)
-		Set ProductId = ..GeefProductIdVanVhConfigMaatwerkProduct(Order, OrderLine, CID, .ReedsGekendeProductId)
+		Set ProductId = ..GeefProductIdVanVhConfigMaatwerkProduct(Order, OrderLine, .ReedsGekendeProductId)
 	}
 	
 	If Order.BestaatOrderLijnViaAxInventTransId(OrderLine.InventTransId) {
@@ -589,16 +588,17 @@
 </Method>
 
 <Method name="GeefProductIdVanVhConfigMaatwerkProduct">
-<FormalSpec><![CDATA[Order:DOM.VKP.Order,OrderLine:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderLine,CID:%String,&ReedsGekendeProductId:%String]]></FormalSpec>
+<FormalSpec><![CDATA[Order:DOM.VKP.Order,OrderLine:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderLine,&ReedsGekendeProductId:%String]]></FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ..GeefJSONParsedVhConfig(OrderLine.VhConfig)
+	Do ..VhConfigRepository.SaveVhConfig(OrderLine.CID, VhConfig)
 	Set ReedsGekendeProductId = ..GeefProductIdVanDossierCodeVoorMaatwerkModel(OrderLine.DossierCode, VhConfig.Model)
 	
 	Do ..VhConfigHelper.ZetVhConfig(VhConfig)
 	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set ProductData.CID = CID
+	Set ProductData.CID = OrderLine.CID
 	Set ProductData.DossierNummer = OrderLine.DossierCode
 	
 	If (ReedsGekendeProductId > 0) {