Change the syntax of this macro