Fix for very bad bug in macros.