X86 env issue fixed