diff --git a/src/cc65/exprdesc.c b/src/cc65/exprdesc.c
index 3d7b7c384..7d0ace004 100644
--- a/src/cc65/exprdesc.c
+++ b/src/cc65/exprdesc.c
@@ -93,8 +93,7 @@ int ED_IsLocPrimaryOrExpr (const ExprDesc* Expr)
 int ED_IsIndExpr (const ExprDesc* Expr)
 /* Check if the expression is a reference to its value */
 {
-    return (Expr->Flags & E_ADDRESS_OF) == 0 &&
-           !ED_IsLocNone (Expr) && !ED_IsLocPrimary (Expr);
+    return (Expr->Flags & E_ADDRESS_OF) == 0 && !ED_IsLocNone (Expr);
 }
 #endif
 
@@ -282,7 +281,7 @@ ExprDesc* ED_AddrExpr (ExprDesc* Expr)
 
         case E_LOC_EXPR:
             Expr->Flags &= ~(E_MASK_LOC | E_MASK_RTYPE);
-            Expr->Flags |= E_LOC_PRIMARY | E_RTYPE_RVAL;
+            Expr->Flags |= E_ADDRESS_OF | E_LOC_PRIMARY | E_RTYPE_RVAL;
             break;
 
         default:
diff --git a/src/cc65/exprdesc.h b/src/cc65/exprdesc.h
index 13eb36e5e..f2b66ee56 100644
--- a/src/cc65/exprdesc.h
+++ b/src/cc65/exprdesc.h
@@ -493,8 +493,7 @@ INLINE int ED_IsAddrExpr (const ExprDesc* Expr)
 INLINE int ED_IsIndExpr (const ExprDesc* Expr)
 /* Check if the expression is a reference to its value */
 {
-    return (Expr->Flags & E_ADDRESS_OF) == 0 &&
-           !ED_IsLocNone (Expr) && !ED_IsLocPrimary (Expr);
+    return (Expr->Flags & E_ADDRESS_OF) == 0 && !ED_IsLocNone (Expr);
 }
 #else
 int ED_IsIndExpr (const ExprDesc* Expr);
diff --git a/src/cc65/loadexpr.c b/src/cc65/loadexpr.c
index 4b7f8e279..c5badc1b3 100644
--- a/src/cc65/loadexpr.c
+++ b/src/cc65/loadexpr.c
@@ -92,6 +92,7 @@ static void LoadAddress (unsigned Flags, ExprDesc* Expr)
             g_leasp (Expr->IVal);
             break;
 
+        case E_LOC_PRIMARY:
         case E_LOC_EXPR:
             if (Expr->IVal != 0) {
                 /* We have an expression in the primary plus a constant