diff --git a/library/BSSMAP_LE_Templates.ttcn b/library/BSSMAP_LE_Templates.ttcn
index 70805e7..a1fcc75 100644
--- a/library/BSSMAP_LE_Templates.ttcn
+++ b/library/BSSMAP_LE_Templates.ttcn
@@ -262,8 +262,8 @@
 				bsslap_apdu := {
 					iei := BSSMAP_LE_IEI_APDU,
 					len := 0,
-					spare := '0'B,
 					protocol_id := prot_id,
+					spare := '0'B,
 					data := data
 				},
 				segmentation := segm
@@ -282,8 +282,8 @@
 				bsslap_apdu := {
 					iei := BSSMAP_LE_IEI_APDU,
 					len := ?,
-					spare := '0'B,
 					protocol_id := prot_id,
+					spare := '0'B,
 					data := data
 				},
 				segmentation := segm
@@ -341,8 +341,8 @@
 	var BSSMAP_LE_IE_APDU ie := {
 		iei := BSSMAP_LE_IEI_APDU,
 		len := 0, // overwritten
-		spare := '0'B,
-		protocol_id := prot_id
+		protocol_id := prot_id,
+		spare := '0'B
 	}
 	if (istemplatekind(data, "omit")) {
 		return omit;
@@ -356,15 +356,15 @@
 	var template BSSMAP_LE_IE_APDU ie := {
 		iei := BSSMAP_LE_IEI_APDU,
 		len := ?,
-		spare := '0'B,
-		protocol_id := prot_id
+		protocol_id := prot_id,
+		spare := '0'B
 	}
 	if (istemplatekind(data, "omit")) {
 		return omit;
 	} else if (istemplatekind(data, "*")) {
 		return *;
 	}
-	ie.data := valueof(data);
+	ie.data := data;
 	return ie;
 }