diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index 6890a63bc..69c233ebf 100755
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -848,9 +848,10 @@ sub nextdestiny {
         }
         unless ($ref->{currchain}) {    #If no current chain, copy the default
             $ref->{currchain} = $ref->{chain};
-        } else {
-            if ($ref->{currstate} and ($ref->{currstate} eq $ref->{currchain})) {
+        } elsif ($ref->{currchain} !~ /[,;]/){
+            if ($ref->{currstate} and ($ref->{currchain} =~ /$ref->{currstate}/)) {
                 $ref->{currchain} = 'standby';
+                $callnodeset = 0;
             }
         }
         my @chain = split /[,;]/, $ref->{currchain};