Add enableLexer and Fix bug