gustafn
committed
on 30 Mar
avoid double substitutions