Wrong {{macro}} parsing fixed