Another attempt to sort the x86 issue