Index: Prod/GAData/Product/tmpKPRCreate.mac.rou
===================================================================
diff -u -r17620 -r18350
--- Prod/GAData/Product/tmpKPRCreate.mac.rou	(.../tmpKPRCreate.mac.rou)	(revision 17620)
+++ Prod/GAData/Product/tmpKPRCreate.mac.rou	(.../tmpKPRCreate.mac.rou)	(revision 18350)
@@ -50,6 +50,9 @@
 	. Do BLDIND^PRODUKT2(NewPRNr)   ; Added by WimV on 19/04/2010
 	. Lock:(ModPRNr) -^KPR(ModPRNr)
  
+	; Fill ^HADPR en ^PRBS nodes
+	Do:Opties["H" kpcHALFFAB()
+	
 	If ('ModPRNr)
 	{
 	 	Do Gemaakt^PRODUKT2(NewPRNr) 
@@ -59,8 +62,7 @@
 	 	Do Gewijzigd^PRODUKT2(ModPRNr)
 	}
  	
-	; Fill ^HADPR en ^PRBS nodes
-	Do:Opties["H" kpcHALFFAB()
+	
 	;If $G(^KLPUTZ("AS")) Do kpcCalcSchaduwPrijs(ModPRNr)
 	Quit
 kpcCalcSchaduwPrijs(PRNr)
@@ -737,5 +739,6 @@
  . Set Oms(Oms)=$G(Oms(Oms))_$S($L($G(Oms(Oms))):";",1:"")_Txt
  Set Txt=""
  Quit
-
-
+ 
+ 
+ 
\ No newline at end of file
Index: TECH/PubSub/impl/WachtendEventAanmaken.cls.xml
===================================================================
diff -u -r17777 -r18350
--- TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(.../WachtendEventAanmaken.cls.xml)	(revision 17777)
+++ TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(.../WachtendEventAanmaken.cls.xml)	(revision 18350)
@@ -16,8 +16,10 @@
 		Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
 		Do Logger.ErrorMail("Onbewaarbare subscription","Event: "_Event.Type_", Status: "_$$ParseStatus^vhLib(Status))
 	} else {
-		while '..EventProcessed(WachtendEvent.%Id()) {
-			hang 0.2
+		if Event.%ClassName(1) '= "TECH.Events.KenmerkModifiedEvent" {
+			while '..EventProcessed(WachtendEvent.%Id()) {
+				hang 0.02
+			}
 		}
 	}
 ]]></Implementation>