fixes handling mpds with AST in the future