diff --git a/sqllineage/core.py b/sqllineage/core.py
index 231aa26..5b010e2 100644
--- a/sqllineage/core.py
+++ b/sqllineage/core.py
@@ -3,13 +3,13 @@ import sys
 from typing import List, Set
 
 import sqlparse
-from sqlparse.sql import Function, Identifier, Parenthesis, Statement, TokenList
+from sqlparse.sql import Comment, Function, Identifier, Parenthesis, Statement, TokenList
 from sqlparse.tokens import Keyword, Token
 
 SOURCE_TABLE_TOKENS = ('FROM', 'JOIN', 'INNER JOIN', 'LEFT JOIN', 'RIGHT JOIN', 'LEFT OUTER JOIN', 'RIGHT OUTER JOIN',
                        'FULL OUTER JOIN', 'CROSS JOIN')
 TARGET_TABLE_TOKENS = ('INTO', 'OVERWRITE', 'TABLE')
-TEMP_TABLE_TOKENS = ('WITH', )
+TEMP_TABLE_TOKENS = ('WITH',)
 
 
 class LineageParser(object):
@@ -53,7 +53,7 @@ Target Tables:
     def target_tables(self) -> Set[str]:
         return self._target_tables
 
-    def _extract_from_token(self, token: Token):
+    def _extract_from_token(self, token: Token) -> None:
         source_table_token_flag = target_table_token_flag = temp_table_token_flag = False
         for sub_token in token.tokens:
             if isinstance(sub_token, TokenList):
@@ -72,7 +72,7 @@ Target Tables:
                 self._target_tables.add(sub_token.get_alias())
                 continue
             if source_table_token_flag:
-                if sub_token.is_whitespace:
+                if self.__token_negligible_before_tablename(sub_token):
                     continue
                 else:
                     assert isinstance(sub_token, Identifier)
@@ -85,7 +85,7 @@ Target Tables:
                         self._source_tables.add(sub_token.get_real_name())
                     source_table_token_flag = False
             elif target_table_token_flag:
-                if sub_token.is_whitespace:
+                if self.__token_negligible_before_tablename(sub_token):
                     continue
                 elif isinstance(sub_token, Function):
                     # insert into tab (col1, col2), tab (col1, col2) will be parsed as Function
@@ -98,7 +98,7 @@ Target Tables:
                     self._target_tables.add(sub_token.get_real_name())
                     target_table_token_flag = False
             elif temp_table_token_flag:
-                if sub_token.is_whitespace:
+                if self.__token_negligible_before_tablename(sub_token):
                     continue
                 else:
                     assert isinstance(sub_token, Identifier)
@@ -107,6 +107,10 @@ Target Tables:
                     self._extract_from_token(sub_token)
                     temp_table_token_flag = False
 
+    @classmethod
+    def __token_negligible_before_tablename(cls, token: Token) -> bool:
+        return token.is_whitespace or isinstance(token, Comment)
+
 
 def main():
     parser = argparse.ArgumentParser(prog='sqllineage', description='SQL Lineage Parser.')

diff --git a/tests/test_select.py b/tests/test_select.py
index 8837091..69b6133 100644
--- a/tests/test_select.py
+++ b/tests/test_select.py
@@ -30,6 +30,14 @@ def test_select_with_comment():
     helper("SELECT -- comment1\n col1 FROM tab1", {"tab1"})
 
 
+def test_select_with_comment_after_from():
+    helper("SELECT col1\nFROM  -- comment\ntab1", {"tab1"})
+
+
+def test_select_with_comment_after_join():
+    helper("select * from tab1 join --comment\ntab2 on tab1.x = tab2.x", {"tab1", "tab2"})
+
+
 def test_select_keyword_as_column_alias():
     # here `as` is the column alias
     helper("SELECT 1 `as` FROM tab1", {"tab1"})

comment in line raise AssertionError
```sql
select
*
from  -- comment
tab_a
```

This will raise AssertionError
tests/test_select.py::test_select_with_comment_after_from tests/test_select.py::test_select_with_comment_after_join
tests/test_select.py::test_select tests/test_select.py::test_select_multi_line tests/test_select.py::test_select_asterisk tests/test_select.py::test_select_value tests/test_select.py::test_select_function tests/test_select.py::test_select_with_where tests/test_select.py::test_select_with_comment tests/test_select.py::test_select_keyword_as_column_alias tests/test_select.py::test_select_with_table_alias tests/test_select.py::test_select_count tests/test_select.py::test_select_subquery tests/test_select.py::test_select_inner_join tests/test_select.py::test_select_join tests/test_select.py::test_select_left_join tests/test_select.py::test_select_left_semi_join tests/test_select.py::test_select_left_semi_join_with_on tests/test_select.py::test_select_right_join tests/test_select.py::test_select_full_outer_join tests/test_select.py::test_select_full_outer_join_with_full_as_alias tests/test_select.py::test_select_cross_join tests/test_select.py::test_select_cross_join_with_on tests/test_select.py::test_select_join_with_subquery tests/test_select.py::test_with_select