fix substitution