fixed overwrite macros