fixed macro style