Fix macro space issue