fix push_macro, asked Tom to help me testfix push_macro