fixed macro expansion?