Fix AST RollUp