fixed macros