diff --git a/lib/get.js b/lib/get.js
index 1d713d4..ddbc7ee 100644
--- a/lib/get.js
+++ b/lib/get.js
@@ -1,5 +1,7 @@
 module.exports.get = (opts, options, s3) => {
-    let challengeKey = options.directory + opts.challenge.token;
+    let challengeKey = path.join(options.directory, opts.challenge.token);
+    console.log('get', challengeKey);
+
     return s3.getObject({ Key: challengeKey, Bucket: options.bucketName }).promise().then(function (data) {
         console.log('Successfully retrieved challenge.' + data.Body.toString());
         return {
diff --git a/lib/remove.js b/lib/remove.js
index 57a820c..3807f3a 100644
--- a/lib/remove.js
+++ b/lib/remove.js
@@ -1,5 +1,7 @@
 module.exports.remove = (opts, options, s3) => {
-    challengeKey = options.directory + opts.challenge.token;
+    let challengeKey = path.join(options.directory, opts.challenge.token);
+    console.log('remove', challengeKey);
+
     return s3.deleteObject({ Key: challengeKey, Bucket: options.bucketName }).promise().then(function (data) {
         console.log('Successfully deleted challenge.');
         return data;
diff --git a/lib/set.js b/lib/set.js
index fdebe2a..359a7e8 100644
--- a/lib/set.js
+++ b/lib/set.js
@@ -1,8 +1,8 @@
 const path = require('path');
 
 module.exports.set = (opts, options, s3) => {
-    var challengeKey = path.join(options.directory, opts.challenge.token);
-    console.log(challengeKey);
+    let challengeKey = path.join(options.directory, opts.challenge.token);
+    console.log('set', challengeKey);
 
     return s3.putObject({ Key: challengeKey, Body: opts.challenge.keyAuthorization, Bucket: options.bucketName }).promise().then(function (data) {
         console.log('Successfully created challenge.');