Double substitution fix