diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
index b2baa407..14c8999a 100644
--- a/deploy/lib/server_config.rb
+++ b/deploy/lib/server_config.rb
@@ -514,10 +514,12 @@ def execute_query(query, properties = {})
   end
 
   def restart
-    group = ARGV.shift
-    # Exclude any argument passed from command line.
-    if group && group.index("-") == 0
-      group = nil
+    group = nil
+    ARGV.each do |arg|
+      # Exclude any argument passed from command line.
+      if ! arg.match("^-")
+        group = arg
+      end
     end
 
     if group && group == "cluster"
@@ -525,7 +527,10 @@ def restart
     elsif group
       logger.info "Restarting MarkLogic Server group #{group}"
     else
-      logger.info "Restarting MarkLogic Server group of #{@hostname}"
+      # restarting partial cluster unsafe when working with multiple groups
+      #logger.info "Restarting MarkLogic Server group of #{@hostname}"
+      logger.info "Restarting MarkLogic Server cluster of #{@hostname}"
+      group = "cluster"
     end
     logger.debug "this: #{self}"
     setup = File.read ServerConfig.expand_path("#{@@path}/lib/xquery/setup.xqy")