Fixed issue when adding macros.