diff --git a/src/rlc.cpp b/src/rlc.cpp
index c733667..f6d6f4a 100644
--- a/src/rlc.cpp
+++ b/src/rlc.cpp
@@ -98,7 +98,7 @@
 	return (ssn - 1 - bitnum);
 }
 
-void gprs_rlc_dl_window::update(BTS *bts, char *show_rbb, uint8_t ssn,
+void gprs_rlc_dl_window::update(BTS *bts, char *show_rbb, uint16_t ssn,
 			uint16_t *lost, uint16_t *received)
 {
 	/* SSN - 1 is in range V(A)..V(S)-1 */
diff --git a/src/rlc.h b/src/rlc.h
index 4905aa1..f16a910 100644
--- a/src/rlc.h
+++ b/src/rlc.h
@@ -158,7 +158,7 @@
 	/* Methods to manage reception */
 	int resend_needed();
 	int mark_for_resend();
-	void update(BTS *bts, char *show_rbb, uint8_t ssn,
+	void update(BTS *bts, char *show_rbb, uint16_t ssn,
 			uint16_t *lost, uint16_t *received);
 	int move_window();
 	void show_state(char *show_rbb);
@@ -196,8 +196,8 @@
 
 	const uint16_t ssn() const;
 
-	bool is_in_window(uint8_t bsn) const;
-	bool is_received(uint8_t bsn) const;
+	bool is_in_window(uint16_t bsn) const;
+	bool is_received(uint16_t bsn) const;
 
 	void update_rbb(char *rbb);
 	void raise_v_r_to(int moves);
@@ -400,7 +400,7 @@
 	return (m_v_s - m_v_a) & mod_sns();
 }
 
-inline bool gprs_rlc_ul_window::is_in_window(uint8_t bsn) const
+inline bool gprs_rlc_ul_window::is_in_window(uint16_t bsn) const
 {
 	uint16_t offset_v_q;
 
@@ -411,7 +411,7 @@
 	return offset_v_q < ws();
 }
 
-inline bool gprs_rlc_ul_window::is_received(uint8_t bsn) const
+inline bool gprs_rlc_ul_window::is_received(uint16_t bsn) const
 {
 	uint16_t offset_v_r;