Now really fix x86 substitution