Fixed x86 platform (master)