Index: APPS/Halux/AAP/DnaCodeGenerator.cls.xml
===================================================================
diff -u -r57066 -r57415
--- APPS/Halux/AAP/DnaCodeGenerator.cls.xml	(.../DnaCodeGenerator.cls.xml)	(revision 57066)
+++ APPS/Halux/AAP/DnaCodeGenerator.cls.xml	(.../DnaCodeGenerator.cls.xml)	(revision 57415)
@@ -9,7 +9,7 @@
 <Implementation><![CDATA[
 	#dim IncrementeelGedeelte As %String = ""
 	#dim DnaCode As %String = ""
-	#dim DnaNummer As %Integer = 1727631
+	#dim DnaNummer As %Integer = 1727605
 	#dim AlfanumeriekDeel As %String = "AAAAA"
 	
 	Lock +^APPS.Halux.AAP.DnaCodeGenerator(Prefix)
@@ -18,6 +18,10 @@
 		If $$$HasLength($Get(^APPS.Halux.AAP.DnaCodeGenerator(Prefix))) {
 			Set DnaNummer = $Piece(^APPS.Halux.AAP.DnaCodeGenerator(Prefix),"\",1) + 1
 			Set AlfanumeriekDeel = ..GeefAlfanumeriekDeel(DnaNummer)
+			While AlfanumeriekDeel [ "0" {
+				Set DnaNummer = DnaNummer + 1
+				Set AlfanumeriekDeel = ..GeefAlfanumeriekDeel(DnaNummer)
+			}
 		}
 		
 		#dim CheckDigit As %String = $$CHKDIGIT^HAD(Prefix_AlfanumeriekDeel)
@@ -41,10 +45,6 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim AlfanumeriekDeel As %String = $$ALFAKEY^vhRtn1(DnaNummer,"AN")
-	While AlfanumeriekDeel [ "0" {
-		Set DnaNummer = DnaNummer + 1
-		Set AlfanumeriekDeel = $$ALFAKEY^vhRtn1(DnaNummer,"AN")
-	}
 	Quit AlfanumeriekDeel
 ]]></Implementation>
 </Method>