diff --git a/include/xo/tokenizer2/Token.hpp b/include/xo/tokenizer2/Token.hpp
index 9ddd0181..9c748933 100644
--- a/include/xo/tokenizer2/Token.hpp
+++ b/include/xo/tokenizer2/Token.hpp
@@ -88,7 +88,7 @@ namespace xo {
                 return Token(tokentype::tk_symbol, txt);
             }
             /** token representing quote @c "'" **/
-            static Token quote() { return Token(tokentype::tk_quote); }
+            static Token quote_token() { return Token(tokentype::tk_quote); }
             /** token representing left angle bracket @c "<" **/
             static Token leftangle() { return Token(tokentype::tk_leftangle); }
             /** token representing right angle bracket @c ">" **/
diff --git a/src/tokenizer2/Tokenizer.cpp b/src/tokenizer2/Tokenizer.cpp
index 8821cd65..323c2d8d 100644
--- a/src/tokenizer2/Tokenizer.cpp
+++ b/src/tokenizer2/Tokenizer.cpp
@@ -429,6 +429,7 @@ namespace xo {
 
                 break;
             }
+            case '#':
             case 'a': case 'A':
             case 'b': case 'B':
             case 'c': case 'C':