Fix #1331: Repair %%% the macro (using a hack)
Merge pull request #1344 from gzm0/fix-%%%

Fix #1331: Repair %%% the macro (using a hack)