Fix reversed macro logic