diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 5cc2674c85..ea20a8cfd2 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -610,7 +610,7 @@ int vmx_vmcs_restore(struct vcpu *v, struct hvm_hw_cpu *c)
                 addrbytes = 4;
             else 
                 addrbytes = 2;
-            ilen = hvm_instruction_length(c->rip, hvm_guest_x86_mode(v));
+            ilen = hvm_instruction_length(c->rip, addrbytes);
             __vmwrite(VM_ENTRY_INSTRUCTION_LEN, ilen);
         }