fix macroexpand