Fix unnecessary substitution