diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn
index de1fcf7..758ad1c 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -228,9 +228,33 @@
 			      other, OTHERWISE;
 			)" };
 
-	external function enc_SystemInformation(in SystemInformation si) return octetstring
+	external function enc_SystemInformationNoPad(in SystemInformation si) return octetstring
 		with { extension "prototype(convert) encode(RAW)" };
 	external function dec_SystemInformation(in octetstring stream) return SystemInformation
 		with { extension "prototype(convert) decode(RAW)" };
 
+	/* Due to a buggy nature of TITAN's padding attributes, we have to apply padding manually. */
+	function enc_SystemInformation(in SystemInformation si) return octetstring
+	{
+		var octetstring si_enc := enc_SystemInformationNoPad(si);
+
+		/* Resulting message length depends on SI Type */
+		select (si.header.message_type) {
+		case (SYSTEM_INFORMATION_TYPE_5,
+		      SYSTEM_INFORMATION_TYPE_5bis,
+		      SYSTEM_INFORMATION_TYPE_5ter) {
+			/* SACCH: no Rest Octets, return 'as-is' */
+			return si_enc;
+			}
+		case (SYSTEM_INFORMATION_TYPE_6) {
+			/* SACCH: pad to 19 octets, leave room for L1/LAPDm headers */
+			return f_pad_oct(si_enc, 19, '2B'O);
+			}
+		case else {
+			/* BCCH: pad to 23 octets */
+			return f_pad_oct(si_enc, 23, '2B'O);
+			}
+		}
+	}
+
 } with { encode "RAW"; variant "FIELDORDER(msb)" }