diff --git a/src/spicelib/devices/adms/admst/adms.implicit.xml b/src/spicelib/devices/adms/admst/adms.implicit.xml
index 6ca8b3634..b2a95ccc5 100644
--- a/src/spicelib/devices/adms/admst/adms.implicit.xml
+++ b/src/spicelib/devices/adms/admst/adms.implicit.xml
@@ -156,6 +156,9 @@
             </admst:otherwise>
           </admst:choose>
         </admst:when>
+        <admst:when test="[name='\$port_connected']">
+          <admst:value-to select="dependency" string="constant"/>
+        </admst:when>
         <admst:otherwise>
           <admst:apply-templates select="arguments" match="e:dependency"/>
           <admst:choose>
@@ -187,6 +190,7 @@
           name='\$abstime' or
           name='\$realtime' or
           name='\$temperature' or
+          name='\$port_connected' or
           name='\$vt' or
           name='idt' or
           name='ddt' or
diff --git a/src/spicelib/devices/adms/bsim6/admsva/bsim6.va b/src/spicelib/devices/adms/bsim6/admsva/bsim6.va
index eb65f3a7d..801425192 100755
--- a/src/spicelib/devices/adms/bsim6/admsva/bsim6.va
+++ b/src/spicelib/devices/adms/bsim6/admsva/bsim6.va
@@ -574,7 +574,7 @@
 `define IPIoz(nam,def,uni,        des) (*units=uni, type="instance",  desc=des*) parameter integer nam=def from(  0:inf);
 
 
-//`define __THERMAL_NODE__
+`define __THERMAL_NODE__
 `ifdef __THERMAL_NODE__
 
 	module bsim6(d, g, s, b, t);
@@ -2388,7 +2388,7 @@ analog begin
 	AT_i = AT_i * (1.0 + Inv_L * ATL);
 	PTWGT_i = PTWGT_i * (1.0 + Inv_L * PTWGTL);
  `ifdef __THERMAL_NODE__
-   if (1 == 0) begin
+   if ($port_connected(t) == 0) begin
      `ifdef __SHMOD__
           $strobe("5 terminal Module, while 't' node is not connected, SH is activated.");
      `else
diff --git a/src/spicelib/devices/adms/bsimcmg/admsva/bsimcmg_body.include b/src/spicelib/devices/adms/bsimcmg/admsva/bsimcmg_body.include
index dd1f2620c..9cf33ad6a 100644
--- a/src/spicelib/devices/adms/bsimcmg/admsva/bsimcmg_body.include
+++ b/src/spicelib/devices/adms/bsimcmg/admsva/bsimcmg_body.include
@@ -1209,7 +1209,7 @@ analog begin
       cbox      =  EPSROX * `EPS0 / EOTBOX;
       epsratio  =  EPSRSUB / EPSROX;
 
-      if (1 /*$port_connected(t)*/ == 1) begin
+      if ($port_connected(t) == 1) begin
           `ifdef __SHMOD__
               if (SHMOD == 0) begin
                   if (SH_WARN == 1) begin
diff --git a/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va b/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
index 7304b8be9..6ef800311 100644
--- a/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
+++ b/src/spicelib/devices/adms/ex-1/admsva/r2_cmc.va
@@ -27,6 +27,8 @@ module r2_cmc(t, b);
    parameter real type = 0; // 0=n, 1=p
    real dT, rsh_t, c, r, Ir, Qc, Ceff, pwrR;
    analog begin : L
+       if ($port_connected(b) == 0)
+          $finish(113);
        if ($param_given(tcr))
           $finish(4);
        if ($param_given(tcr))