align AST version with non-AST version