fix macro expansion