Fixed issue with non-working macros.