Temporal fix for AST modification errors
6 files changed