diff --git a/commands/fun/badmeme.js b/commands/fun/badmeme.js
index 56ce342d..52d38b0d 100644
--- a/commands/fun/badmeme.js
+++ b/commands/fun/badmeme.js
@@ -11,7 +11,7 @@ module.exports = class BadmemeCommand extends Command {
     }
 
     run(message) {
-        const number = 17;
+        const number = Object.keys(responseObject).length;
         const picNumber = Math.floor (Math.random() * (number - 1 + 1)) + 1;
             message.channel.send(`${picNumber}: ${responseObject[picNumber]}`);
           }
diff --git a/commands/fun/despacito.js b/commands/fun/despacito.js
index f38cddf8..fe24d5af 100644
--- a/commands/fun/despacito.js
+++ b/commands/fun/despacito.js
@@ -11,7 +11,7 @@ module.exports = class DespacitoCommand extends Command {
     }
 
     run(message) {
-        const number = 8;
+        const number = Object.keys(responseObject).length;
         const vidNumber = Math.floor (Math.random() * (number - 1 + 1)) + 1;
             message.channel.send(`${vidNumber}: ${responseObject[vidNumber]}`);
           }