fix to normalize substitution