Fixed use of a hardcoded variable inside macro. We must use the user-supplied variabl...