diff --git a/bin/haproxyctl b/bin/haproxyctl
index 8c02286..e83214f 100755
--- a/bin/haproxyctl
+++ b/bin/haproxyctl
@@ -131,8 +131,8 @@ begin
     status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if  ( data[1] == servername) && ( data[17] == 'UP')
-        unixsock("disable server #{data[0]}/#{servername}")
+      if  ( /#{servername}/.match(data[1]) && ( data[17] == 'UP')
+        unixsock("disable server #{data[0]}/#{data[1]}")
       end
     end
   when /enable all EXCEPT (.+)/
@@ -168,8 +168,8 @@ begin
     status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if  ( data[1] == servername) && ( data[17] =~ /Down|MAINT/i)
-        unixsock("enable server #{data[0]}/#{servername}")
+      if  ( /#{servername}/.match(data[1]) && ( data[17] =~ /Down|MAINT/i)
+        unixsock("enable server #{data[0]}/#{data[1]}")
       end
     end
   when 'version'