Fixin substitution. Regression test added.