diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 5741458..8300f8e 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1914,7 +1914,8 @@
 	len := 0, /* overwritten */
 	m := false,
 	el := 1,
-	payload := enc_GsmRrL3Message(valueof(l3))
+	payload := enc_GsmRrL3Message(valueof(l3)),
+	padding := ''O
 }
 
 /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */
diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn
index 5ef953d..baa2b7e 100644
--- a/library/LAPDm_Types.ttcn
+++ b/library/LAPDm_Types.ttcn
@@ -180,7 +180,8 @@
 		uint6_t 		len,
 		boolean			m,
 		uint1_t			el,
-		octetstring		payload	/* zero-length in Frame A */
+		octetstring		payload,	/* zero-length in Frame A */
+		octetstring		padding
 	} with { variant (len) "LENGTHTO(payload)"
 		 variant "FIELDORDER(msb)" };
 
@@ -230,7 +231,8 @@
 			len := 0, /* overwritten in encoder */
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ''O
 		}
 	}
 	template LapdmFrame tr_LAPDm_SABM(template LapdmSapi sapi, template boolean c_r,
@@ -241,7 +243,8 @@
 			len := ?,
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ?
 		}
 	}
 
@@ -253,7 +256,8 @@
 			len := 0, /* overwritten in encoder */
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ''O
 		}
 	}
 	template LapdmFrame tr_LAPDm_UA(template LapdmSapi sapi, template boolean c_r,
@@ -264,7 +268,8 @@
 			len := ?,
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ?
 		}
 	}
 
@@ -275,7 +280,8 @@
 			len := 0, /* overwritten in encoder */
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ''O
 		}
 	}
 	template LapdmFrame tr_LAPDm_DM(template LapdmSapi sapi, template boolean c_r,
@@ -286,7 +292,8 @@
 			len := ?,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ?
 		}
 	}
 
@@ -297,7 +304,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ''O
 		}
 	}
 	template LapdmFrame tr_LAPDm_DISC(template LapdmSapi sapi, template boolean c_r,
@@ -308,7 +316,8 @@
 			len := ?,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ?
 		}
 	}
 
@@ -319,7 +328,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ''O
 		}
 	}
 	template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r,
@@ -330,7 +340,8 @@
 			len := ?,
 			m := false,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ?
 		}
 	}
 
@@ -360,7 +371,8 @@
 			len := ?,
 			m := m,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ?
 		}
 	}
 	template (value) LapdmFrame ts_LAPDm_I(LapdmSapi sapi, boolean c_r, boolean p, uint3_t nr,
@@ -371,7 +383,8 @@
 			len := 0,
 			m := m,
 			el := 1,
-			payload := l3
+			payload := l3,
+			padding := ''O
 		}
 	}
 
@@ -383,7 +396,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ?
 		}
 	}
 	template (value) LapdmFrame ts_LAPDm_RR(LapdmSapi sapi, boolean c_r,
@@ -394,7 +408,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ''O
 		}
 	}
 
@@ -406,7 +421,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ?
 		}
 	}
 	template (value) LapdmFrame ts_LAPDm_REJ(LapdmSapi sapi, boolean c_r,
@@ -417,7 +433,8 @@
 			len := 0,
 			m := false,
 			el := 1,
-			payload := ''O
+			payload := ''O,
+			padding := ''O
 		}
 	}