Fixed the AST parser