Corrected wrong substitution