fix declaration <- definition substitution