Fixing macro compatibility with arc