Resolved issues with x86 version