Index: TECH/Mail.cls.xml
===================================================================
diff -u -r1303 -r1304
--- TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1303)
+++ TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1304)
@@ -46,7 +46,7 @@
 			
 		/// Check DomainPart
 			
-			Set:IsValid IsValid = DomainPart?.(1(.A.N).(1".",1"-")1(.A,.N))
+			Set:IsValid IsValid = DomainPart?1.(1(.A.N)1(1".",1"-"))1(.A)
 			
 			Set:IsValid IsValid = ..CheckPunten(DomainPart)
 		
Index: vhUnitTest/TECH/Mail.cls.xml
===================================================================
diff -u -r1303 -r1304
--- vhUnitTest/TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1303)
+++ vhUnitTest/TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1304)
@@ -12,8 +12,13 @@
 	Set CacheNsLookUp = 1
 	Set NsLookUp = 1 
 	
+	
+	Set mail = "Joren.Blancquaert@skynet.12"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
 	Set mail = "Joren"
 	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "wv.vanhoecke@be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
 	Set mail = "JorenBlancquaert@"
 	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
 	Set mail = "Joren.Blancquaert@"