More work on substitution lemma