Fix macro expansion