Solve the x86 vs not x86 issue for good