diff --git a/ttcn/Lib3GPP/NAS/NAS_CommonTemplates.ttcn b/ttcn/Lib3GPP/NAS/NAS_CommonTemplates.ttcn
index 778f41d4d9068e4ee095a2f04fda72bf1cacd17d..ee268e4b076518ffb9b4fb6a4ce5d0eb33360204 100644
--- a/ttcn/Lib3GPP/NAS/NAS_CommonTemplates.ttcn
+++ b/ttcn/Lib3GPP/NAS/NAS_CommonTemplates.ttcn
@@ -727,7 +727,6 @@ module NAS_CommonTemplates {
   { /* @status    APPROVED (ENDC, IMS, IMS_IRAT, LTE, LTE_A_IRAT, LTE_A_PRO, LTE_A_R10_R11, LTE_A_R12, LTE_IRAT, NBIOT, NR5GC, NR5GC_IRAT, POS, UTRAN) */
     protocolID := p_ContainerId,
     protocolLength := int2oct(p_ContainerLength, 1),
-    protocolLongLength := omit,   // @sic R5s201386 Baseline Moving sic@
     content := p_Content
   };
 
diff --git a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
index 1b77127ad1e3a3c38a956c3dca62b187a970bdb7..1ce58ef0fd29865f46a2089a3b593a12cb68c47d 100644
--- a/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
+++ b/ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn
@@ -640,7 +640,6 @@ type record Non3GPP_NW_ProvidedPolicies {
     NAS_ProtocolConfigOptions_Type pco optional
   } with {
     variant "FIELDORDER(msb)";
-    // FIXME variant (pco) "FORCEOMIT(protocolLongLength)";
     variant (iel) "LENGTHTO (ext, spare, configProtocol, pco)";
     variant (iel) "BYTEORDER(last)";
   };
@@ -648,13 +647,12 @@ type record Non3GPP_NW_ProvidedPolicies {
   type record ProtocolContainer {
     O2_Type                   protocolID,                     /* id is always 2 octets */
     Type4Length_Type          protocolLength        optional, // @sic R5s201386 Baseline Moving sic@
-    Type6Length_Type          protocolLongLength    optional, // always set to omit in UL @sic R5s201386 Baseline Moving sic@
     octetstring               content               optional
   } with {
     variant "FIELDORDER(msb)";
     variant (protocolLength) "LENGTHTO (content)";
     variant (protocolLength) "BYTEORDER(last)";
-    variant (content) "BYTEORDER(last)";
+    variant (content) "BYTEORDER(first)";
   };
 
   type record length (0..83) of ProtocolContainer NAS_ProtocolConfigOptions_Type;