Try to replace the "goto" inside the macro by a "bra".