fix macro again