equiv macro fixed