diff --git a/tgt-vhdl/lpm.cc b/tgt-vhdl/lpm.cc
index b37866fca..2d0fc46e6 100644
--- a/tgt-vhdl/lpm.cc
+++ b/tgt-vhdl/lpm.cc
@@ -115,7 +115,9 @@ static vhdl_expr *part_select_vp_lpm_to_expr(vhdl_scope *scope, ivl_lpm_t lpm)
    if (NULL == off)
       return NULL;
 
-   selfrom->set_slice(off, ivl_lpm_width(lpm) - 1);
+   if (selfrom->get_type()->get_width() > 1)
+      selfrom->set_slice(off, ivl_lpm_width(lpm) - 1);
+   
    return selfrom;
 }
 
diff --git a/tgt-vhdl/stmt.cc b/tgt-vhdl/stmt.cc
index c319abb34..69b98b31d 100644
--- a/tgt-vhdl/stmt.cc
+++ b/tgt-vhdl/stmt.cc
@@ -139,7 +139,7 @@ static vhdl_var_ref *make_assign_lhs(ivl_lval_t lval, vhdl_scope *scope)
    if (base) {
       if (decl->get_type()->get_name() == VHDL_TYPE_ARRAY)
          lval_ref->set_slice(base, 0);
-      else
+      else if (ivl_signal_width(sig) > 1)
          lval_ref->set_slice(base, lval_width - 1);
    }