Fix bug for macros with more than 1 argument