diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c
index 4d7deed..d3f02b6 100644
--- a/openbsc/src/gprs/gprs_sndcp.c
+++ b/openbsc/src/gprs/gprs_sndcp.c
@@ -138,6 +138,7 @@
 	return NULL;
 }
 
+/* Perform actual defragmentation and create an output packet */
 static int defrag_segments(struct gprs_sndcp_entity *sne)
 {
 	struct msgb *msg;
@@ -173,6 +174,8 @@
 		talloc_free(dqe);
 	}
 
+	/* FIXME: cancel timer */
+
 	/* actually send the N-PDU to the SGSN core code, which then
 	 * hands it off to the correct GTP tunnel + GGSN via gtp_data_req() */
 	return sgsn_rx_sndcp_ud_ind(&sne->ra_id, sne->lle->llme->tlli,
@@ -220,8 +223,11 @@
 		}
 		/* store the currently de-fragmented PDU number */
 		sne->defrag.npdu = npdu_num;
+
+		/* Re-set fragmentation state */
 		sne->defrag.no_more = sne->defrag.highest_seg = sne->defrag.seg_have = 0;
-		/* FIXME: Start timer */
+		sne->defrag.tot_len = 0;
+		/* FIXME: (re)start timer */
 	}
 
 	if (sne->defrag.npdu != npdu_num) {