fixed macro expansion