diff --git a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
index e53a5b0c..c2661a9c 100644
--- a/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
+++ b/VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
@@ -8,6 +8,7 @@
 use VariableAnalysis\Lib\Helpers;
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
 class VariableAnalysisSniff implements Sniff {
   /**
@@ -1291,7 +1292,7 @@ protected function processCompactArguments(File $phpcsFile, $stackPtr, $argument
 
     foreach ($arguments as $argumentPtrs) {
       $argumentPtrs = array_values(array_filter($argumentPtrs, function ($argumentPtr) use ($tokens) {
-        return $tokens[$argumentPtr]['code'] !== T_WHITESPACE;
+        return isset(Tokens::$emptyTokens[$tokens[$argumentPtr]['code']]) === false;
       }));
       if (empty($argumentPtrs)) {
         continue;
diff --git a/VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php b/VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php
index 32278ce3..a92e20a8 100644
--- a/VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php
+++ b/VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php
@@ -6,7 +6,7 @@ function function_with_literal_compact($param1, $param2, $param3, $param4) {
     $squish = compact('var1');
     $squish = compact('var3');
     $squish = compact('param1');
-    $squish = compact('var2', 'param3');
+    $squish = compact('var2', /*comment*/ 'param3');
     $squish = compact(array('var4'), array('param4', 'var5'));
     echo $squish;
 }
@@ -20,10 +20,10 @@ function function_with_expression_compact($param1, $param2, $param3, $param4) {
     $var8 = "value8";
     $var9 = "value9";
     $squish = compact("var1");
-    $squish = compact("var3");
+    $squish = compact("var3"/*comment*/ );
     $squish = compact("param1");
     $squish = compact("var2", "param3");
-    $squish = compact(array("var4"), array("param4", "var5"));
+    $squish = compact(array("var4"), array("param4", /*comment*/ "var5"));
     $squish = compact($var6);
     $squish = compact("var" . "7");
     $squish = compact("blah $var8");