diff --git a/lib/bootstrap.js b/lib/bootstrap.js
index 05a1c0706a3..5fab4f0998e 100644
--- a/lib/bootstrap.js
+++ b/lib/bootstrap.js
@@ -5,13 +5,14 @@ const cmdArgs = require('command-line-args');
 require('./utils/process-log');
 
 const isFlagPresent = (args, flag) => args.find(arg => [flag, `--${flag}`].includes(arg));
+const isArgCommandName = (arg, cmd) => arg === cmd.name || arg === cmd.alias;
 const stripDashedFlags = (args, cmd) => {
     const slicedArgs = args.slice(2);
     if (cmd.name === 'serve') {
-        return slicedArgs.filter(arg => arg !== cmd.name && arg !== cmd.alias);
+        return slicedArgs.filter(arg => !isArgCommandName(arg, cmd));
     }
     else {
-        return slicedArgs.filter(arg => ~arg.indexOf('--') && arg !== cmd.name && arg !== cmd.alias);
+        return slicedArgs.filter(arg => ~arg.indexOf('--') && !isArgCommandName(arg, cmd));
     }
 };