diff --git a/CGI.pas b/CGI.pas
index 00470b0..5d468d5 100644
--- a/CGI.pas
+++ b/CGI.pas
@@ -86,6 +86,7 @@ const
    m_cpx_abs              =    236;
    m_cpx_dir              =    228;
    m_cpx_imm              =    224;
+   m_cpy_imm              =    $C0;
    m_dea                  =     58;
    m_dec_abs              =    206;
    m_dec_absX             =    $DE;
diff --git a/Gen.pas b/Gen.pas
index 2421cca..9dc27ff 100644
--- a/Gen.pas
+++ b/Gen.pas
@@ -3340,8 +3340,9 @@ procedure GenIxa (op: icptr);
 { Generate code for a pc_ixa					}
 
 var
-   lab1: integer;			{branch label}
+   lab1,lab2: integer;			{branch labels}
    lLong: longType;			{type of address}
+   signed: boolean;			{doing signed addition?}
    zero: boolean;			{is the index 0?}
 
 
@@ -3394,8 +3395,8 @@ var
 
 
 begin {GenIxa}
+lLong := gLong;
 if smallMemoryModel or (op^.left^.opcode = pc_lda) then begin
-   lLong := gLong;
    gLong.preference := inPointer+localAddress+globalLabel;
    GenTree(op^.left);
    case gLong.where of
@@ -3601,31 +3602,61 @@ if smallMemoryModel or (op^.left^.opcode = pc_lda) then begin
       end; {case}
    end {if smallMemoryModel or (op^.left^.opcode = pc_lda)}
 else begin
-   gLong.preference := onStack;
-   GenTree(op^.left);
-   GenTree(op^.right);
-   if IndexCanBeNegative then begin
-      lab1 := GenLabel;
-      GenNative(m_ldx_imm, immediate, $0000, nil, 0);
-      GenImplied(m_tay);
-      GenNative(m_bpl, relative, lab1, nil, 0);
-      GenImplied(m_dex);
-      GenLab(lab1);
-      GenImplied(m_phx);
-      GenImplied(m_pha);
-      end {else if}
+   signed := IndexCanBeNegative;
+   if (not signed)
+      and ((globalLabel & lLong.preference) <> 0)
+      and (op^.left^.opcode = pc_lao) 
+      then begin
+      if Complex(op^.right) then begin
+         GenTree(op^.right);
+         GenImplied(m_tax);
+         end {if}
+      else
+         LoadX(op^.right);
+      gLong.where := globalLabel;
+      gLong.fixedDisp := false;
+      gLong.disp := op^.left^.q;
+      gLong.lab := op^.left^.lab;
+      end {if}
    else begin
-      GenNative(m_pea, immediate, 0, nil, 0);
-      GenImplied(m_pha);
+      if op^.left^.opcode = pc_lao then begin
+         GenTree(op^.right);
+         if signed then
+            GenImplied(m_tay);
+         GenImplied(m_clc);
+         GenNative(m_adc_imm, immediate, op^.left^.q, op^.left^.lab, 0);
+         GenNative(m_ldx_imm, immediate, op^.left^.q, op^.left^.lab, shift16);
+         end {if}
+      else begin
+         gLong.preference := onStack;
+         GenTree(op^.left);
+         GenTree(op^.right);
+         if signed then
+            GenImplied(m_tay);
+         GenImplied(m_clc);
+         GenNative(m_adc_s, direct, 1, nil, 0);
+         GenImplied(m_plx);
+         GenImplied(m_plx);
+         end; {else}
+      lab1 := GenLabel;
+      GenNative(m_bcc, relative, lab1, nil, 0);
+      GenImplied(m_inx);
+      GenLab(lab1);
+      if signed then begin
+         GenNative(m_cpy_imm, immediate, $0000, nil, 0);
+         lab2 := GenLabel;
+         GenNative(m_bpl, relative, lab2, nil, 0);
+         GenImplied(m_dex);
+         GenLab(lab2);
+         end; {if}
+      if (A_X & lLong.preference) <> 0 then
+         gLong.where := A_X
+      else begin
+         GenImplied(m_phx);
+         GenImplied(m_pha);
+         gLong.where := onStack;
+         end; {else}
       end; {else}
-   GenImplied(m_clc);
-   GenImplied(m_pla);
-   GenNative(m_adc_s, direct, 3, nil, 0);
-   GenNative(m_sta_s, direct, 3, nil, 0);
-   GenImplied(m_pla);
-   GenNative(m_adc_s, direct, 3, nil, 0);
-   GenNative(m_sta_s, direct, 3, nil, 0);
-   gLong.where := onStack;
    end; {else}
 end; {GenIxa}
 
diff --git a/Native.pas b/Native.pas
index 9bbacb3..05378d5 100644
--- a/Native.pas
+++ b/Native.pas
@@ -854,7 +854,7 @@ case p_opcode of
    
    m_bra,m_brl,m_clc,m_cmp_abs,m_cmp_dir,m_cmp_imm,m_cmp_s,m_cmp_indl,
    m_cmp_indly,m_cpx_imm,m_jml,m_jmp_indX,m_plb,m_rtl,m_rts,m_sec,d_add,d_pin,
-   m_cpx_abs,m_cpx_dir,m_cmp_dirx,m_plp,m_cop,d_wrd:    ;
+   m_cpx_abs,m_cpx_dir,m_cpy_imm,m_cmp_dirx,m_plp,m_cop,d_wrd:    ;
 
    m_pea: begin
       if aRegister.condition = regImmediate then