diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 85b0bed458dc3d176ab6cfe37329789934f2b5e6..bc22e2731616ac0578e27f48d6d46352a3d615e8 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1488,7 +1488,7 @@ sub migrate_winstations
         $dn_old =~ m/^[^,]+,.*$systemrdn,(.+)$/ or die "Could not parse dn ".$dn_old."\n";
         my $entrybase = $1;
         if (!branch_exists($ldap, "$workstationrdn,$entrybase")) {
-          if ($workstationrdn =~ m/^([^,]),([^,])$/) {
+          if ($workstationrdn =~ m/^([^,]+),([^,]+)$/) {
             if (!branch_exists($ldap, "$2,$entrybase")) {
               create_branch($ldap, $entrybase, $2);
             }