fix strange behavior after inserting a substitution, #38803, fallout from #24331