trenner
committed
on 15 Jan 20
ensure nonce is substituted in subst