diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf
index 2f30be3c57..c013336a69 100644
--- a/asn1/lte-rrc/lte-rrc.cnf
+++ b/asn1/lte-rrc/lte-rrc.cnf
@@ -27,5 +27,5 @@ UL-DCCH-Message              @ul.dcch
 %(DEFAULT_BODY)s
 
 	if ((nas_eps_tvb)&&(nas_eps_handle))
-		call_dissector(nas_eps_handle,nas_eps_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+		call_dissector(nas_eps_handle,nas_eps_tvb,%(ACTX)s->pinfo, tree);
 
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf
index 5882e16ad8..9aa8edc40c 100644
--- a/asn1/rrc/rrc.cnf
+++ b/asn1/rrc/rrc.cnf
@@ -76,7 +76,7 @@ UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info
 %(DEFAULT_BODY)s
 
 	if (nas_message_tvb)
-		call_dissector(gsm_a_dtap_handle,nas_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+		call_dissector(gsm_a_dtap_handle,nas_message_tvb,%(ACTX)s->pinfo, tree);
 
 #.FN_BODY InterRATHandoverInfo/ue-CapabilityContainer/present VAL_PTR = &ue_radio_access_cap_info_tvb
   tvbuff_t *ue_radio_access_cap_info_tvb=NULL;
@@ -84,7 +84,7 @@ UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info
 %(DEFAULT_BODY)s
 
 	if (ue_radio_access_cap_info_tvb)
-		call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+		call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,%(ACTX)s->pinfo, tree);
 
 #.END
 
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index d4de743192..aae81b4374 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -197,7 +197,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 %(DEFAULT_BODY)s
 
   if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
-    call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
+    call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree);
 
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(s1ap_ProtocolIE_ID_vals)
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 06f64deb5b..bed4d5b699 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -8789,7 +8789,7 @@ dissect_lte_rrc_NAS_DedicatedInformation(tvbuff_t *tvb _U_, int offset _U_, asn1
 
 
 	if ((nas_eps_tvb)&&(nas_eps_handle))
-		call_dissector(nas_eps_handle,nas_eps_tvb,actx->pinfo, proto_tree_get_root(tree));
+		call_dissector(nas_eps_handle,nas_eps_tvb,actx->pinfo, tree);
 
 
   return offset;
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 46f50b6ed2..288bebb2df 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -39741,7 +39741,7 @@ dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 
 	if (nas_message_tvb)
-		call_dissector(gsm_a_dtap_handle,nas_message_tvb,actx->pinfo, proto_tree_get_root(tree));
+		call_dissector(gsm_a_dtap_handle,nas_message_tvb,actx->pinfo, tree);
 
 
 
@@ -80094,7 +80094,7 @@ dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
 
 
 	if (ue_radio_access_cap_info_tvb)
-		call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,actx->pinfo, proto_tree_get_root(tree));
+		call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,actx->pinfo, tree);
 
 
 
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 9df38f003c..d46474505f 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -2818,7 +2818,7 @@ dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 
 
   if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
-    call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, proto_tree_get_root(tree));
+    call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, tree);