diff --git a/src/cluster.c b/src/cluster.c
index ef381f29a..32335bbf9 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -5026,7 +5026,7 @@ void clusterCommand(client *c) {
 "    Reset current node (default: soft).",
 "SET-CONFIG-EPOCH <epoch>",
 "    Set config epoch of current node.",
-"SETSLOT <slot> (IMPORTING|MIGRATING|STABLE|NODE <node-id>)",
+"SETSLOT <slot> (IMPORTING <node-id>|MIGRATING <node-id>|STABLE|NODE <node-id>)",
 "    Set slot state.",
 "REPLICAS <node-id>",
 "    Return <node-id> replicas.",
diff --git a/src/commands.c b/src/commands.c
index 2de24bc2a..d3b2e45b3 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -588,9 +588,9 @@ NULL
 
 /* CLUSTER SETSLOT subcommand argument table */
 struct redisCommandArg CLUSTER_SETSLOT_subcommand_Subargs[] = {
-{"node-id",ARG_TYPE_INTEGER,-1,"IMPORTING",NULL,NULL,CMD_ARG_NONE},
-{"node-id",ARG_TYPE_INTEGER,-1,"MIGRATING",NULL,NULL,CMD_ARG_NONE},
-{"node-id",ARG_TYPE_INTEGER,-1,"NODE",NULL,NULL,CMD_ARG_NONE},
+{"node-id",ARG_TYPE_STRING,-1,"IMPORTING",NULL,NULL,CMD_ARG_NONE},
+{"node-id",ARG_TYPE_STRING,-1,"MIGRATING",NULL,NULL,CMD_ARG_NONE},
+{"node-id",ARG_TYPE_STRING,-1,"NODE",NULL,NULL,CMD_ARG_NONE},
 {"stable",ARG_TYPE_PURE_TOKEN,-1,"STABLE",NULL,NULL,CMD_ARG_NONE},
 {0}
 };
diff --git a/src/commands/cluster-setslot.json b/src/commands/cluster-setslot.json
index dc9af6138..5d1aa45fc 100644
--- a/src/commands/cluster-setslot.json
+++ b/src/commands/cluster-setslot.json
@@ -26,17 +26,17 @@
                 "arguments": [
                     {
                         "name": "node-id",
-                        "type": "integer",
+                        "type": "string",
                         "token": "IMPORTING"
                     },
                     {
                         "name": "node-id",
-                        "type": "integer",
+                        "type": "string",
                         "token": "MIGRATING"
                     },
                     {
                         "name": "node-id",
-                        "type": "integer",
+                        "type": "string",
                         "token": "NODE"
                     },
                     {