Fix macro type check