Solution change for x86 support