diff --git a/scp.c b/scp.c
index ee58bfab..96553e02 100644
--- a/scp.c
+++ b/scp.c
@@ -6456,6 +6456,7 @@ else {
                 for (mptr = sim_dflt_dev->modifiers; mptr->mask != 0; mptr++) {
                     if (mptr->mstring && (MATCH_CMD (gbuf, mptr->mstring) == 0)) {
                         dptr = sim_dflt_dev;
+                        uptr = dptr->units;
                         cptr = svptr;
                         while (sim_isspace(*cptr))
                             ++cptr;
@@ -6777,6 +6778,7 @@ else {
                          (mptr->pstring && (MATCH_CMD (gbuf, mptr->pstring) == 0))) ||
                         (!(mptr->mask & MTAB_VDV) && (mptr->mstring && (MATCH_CMD (gbuf, mptr->mstring) == 0)))) {
                         dptr = sim_dflt_dev;
+                        uptr = dptr->units;
                         lvl = MTAB_VDV;                 /* device match */
                         cptr = svptr;
                         while (sim_isspace(*cptr))