Fix substitution