Index: cFA14.mac.rou
===================================================================
diff -u -r38073 -r38078
--- cFA14.mac.rou	(.../cFA14.mac.rou)	(revision 38073)
+++ cFA14.mac.rou	(.../cFA14.mac.rou)	(revision 38078)
@@ -19,8 +19,9 @@
 17 S @%Q1=0 
    New KlantId set KlantId = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($piece(KI1," ",2))
    New AdresVolgNr set AdresVolgNr = $piece($replace(KI2," ",""),"L",2)
-   Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresVerwijderdEvent(KlantId,AdresVolgNr)
-   Kill ^KKL.AdresI("KlantId_AdresVolgNr",$piece(@("^"_Q_"KL(KI1,KI2)"),"\",28))
+   New AdresId set AdresId = $piece(@("^"_Q_"KL(KI1,KI2)"),"\",28)
+   Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresVerwijderdEvent(AdresId)
+   Kill ^KKL.AdresI("KlantId_AdresVolgNr",AdresId)
    Kill @("^"_Q_"KL(KI1,KI2)") 
    I $E($N(@("^"_Q_"KL(KI1,""L"")")),1)'="L" S ^(0)=$P(^(0),D,1,18)_D_D_$P(^(0),D,20,99),@%Q1=1
 19 X ^cTXT(0,"N",208) R K G YZ
@@ -42,7 +43,8 @@
  S $P(B(1),D,2)=$$TrimEndOfText^vhLib($$TrimBeginOfText^vhLib($P(B(1),D,2)))
  S @("^"_Q_"KL(KI1,KI2)")=B(1),@%Q1=1
  New KlantId set KlantId = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($piece(KI1," ",2))
- Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGewijzigdEvent(KlantId,$piece($replace(KI2," ",""),"L",2))
+ New AdresId set AdresId = $piece(@("^"_Q_"KL(KI1,KI2)"),"\",28)
+ Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGewijzigdEvent(AdresId)
 
  ;
 YZ D REBLDOBJ^TAPI("K",KC) Q