Bugfix on new macro