Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71855 -r72827
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71855)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 72827)
@@ -26,17 +26,17 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	
-	If (OorsprongKettingString = "") {
+	If (OorsprongKettingString = ""){
 		Set Personality = ..GeefFallBackPersonality(FallBackKlantId)
 	} Else {
 		Try {
 			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
 			#dim PersonalityID As %Integer
 			
-			If $ListLength(OorsprongKetting) < 3 {
-				Set PersonalityID = $Piece($List(OorsprongKetting, 1),",", 1)
-			} Else {
+			If (..IsOorsprongKettingVanBlumPolen(OorsprongKetting)) {
 				Set PersonalityID = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1)
+			} Else {
+				Set PersonalityID = $Piece($List(OorsprongKetting, 1),",", 1)
 			}
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -87,6 +87,19 @@
 	Quit ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
 ]]></Implementation>
 </Method>
+
+<Method name="IsOorsprongKettingVanBlumPolen">
+<FormalSpec>OorsprongKetting:%List</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim PersonalityIdBlumPolen As %Integer = ##class(DOM.common.enu.Personality).BlumPL()
+	
+	If (($ListLength(OorsprongKetting) >= 2) && ($Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1) = PersonalityIdBlumPolen)) {
+		Quit $$$True
+	}
+	Quit $$$False
+]]></Implementation>
+</Method>
 </Class>