gustafn
committed
on 30 Mar 19
avoid double substitutions