fixed macros
2 files changed