trenner
committed
on 15 Jan
ensure nonce is substituted in subst