diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index 514cd0eb..51e94f35 100755
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -73,7 +73,7 @@ slaveCommands.add(new libCommand.Command({
 		yargs.option("id", { type: "number", nargs: 1, describe: "Slave id", demandOption: true });
 	}],
 	handler: async function(args, control) {
-		let response = await link.messages.generateSlaveToken.send(control, { slave_id: args.id });
+		let response = await libLink.messages.generateSlaveToken.send(control, { slave_id: args.id });
 		console.log(response.token);
 	},
 }));
diff --git a/packages/master/master.js b/packages/master/master.js
index b8adf2fd..6268151a 100755
--- a/packages/master/master.js
+++ b/packages/master/master.js
@@ -598,7 +598,7 @@ class ControlConnection extends BaseConnection {
 	}
 
 	async generateSlaveTokenRequestHandler(message) {
-		return { token: generateSlaveToken(message.data.slave_id) };
+		return { token: this.generateSlaveToken(message.data.slave_id) };
 	}
 
 	async createSlaveConfigRequestHandler(message) {
diff --git a/test/integration/clusterio.js b/test/integration/clusterio.js
index 96b90146..b84f60ff 100644
--- a/test/integration/clusterio.js
+++ b/test/integration/clusterio.js
@@ -25,6 +25,11 @@ describe("Integration of Clusterio", function() {
 				await execCtl("slave list");
 			});
 		});
+		describe("slave generate-token", function() {
+			it("runs", async function() {
+				await execCtl("slave generate-token --id 42");
+			});
+		});
 		describe("instance list", function() {
 			it("runs", async function() {
 				await execCtl("instance list");