diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index bc55f58..cf0dfef 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -383,16 +383,17 @@
 }
 
 template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA(BSSMAP_FIELD_IPAddress addr,
-									    uint16_t udp_port) := {
+									    uint16_t udp_port,
+									    integer len) := {
 	elementIdentifier := '7C'O,
-	lengthIndicator := 0, /* overwritten */
+	lengthIndicator := len, /* overwritten */
 	ipAddress := addr,
 	uDPPortValue := udp_port
 }
 template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA4(OCT4 ip, uint16_t pt) :=
-							ts_BSSMAP_IE_AoIP_TLA({ipv4:=ip}, pt);
+							ts_BSSMAP_IE_AoIP_TLA({ipv4:=ip}, pt, 6);
 template (value) BSSMAP_IE_AoIP_TransportLayerAddress ts_BSSMAP_IE_AoIP_TLA6(OCT16 ip, uint16_t pt) :=
-							ts_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt);
+							ts_BSSMAP_IE_AoIP_TLA({ipv6:=ip}, pt, 18);
 
 template (value) BSSMAP_IE_KC128 ts_BSSMAP_IE_Kc128(OCT16 kc128) := {
 	elementIdentifier := '83'O,