diff --git a/src/parser/aast/api/AASTNode.php b/src/parser/aast/api/AASTNode.php
--- a/src/parser/aast/api/AASTNode.php
+++ b/src/parser/aast/api/AASTNode.php
@@ -257,7 +257,7 @@
     $left = head($tokens);
 
     while ($left &&
-           (!$left->isAnyWhitespace() ||
+           (!($left->isAnyWhitespace() || $left->isComment()) ||
             strpos($left->getValue(), "\n") === false)) {
       $left = $left->getPrevToken();
     }
@@ -266,6 +266,11 @@
       return null;
     }
 
+    $next = $left->getNextToken();
+    if ($next->isAnyWhitespace()) {
+      return $next->getValue();
+    }
+
     return preg_replace("/^.*\n/s", '', $left->getValue());
   }