fixing macro ordering