Fix macro