diff --git a/src/apps/uclient/uclient.c b/src/apps/uclient/uclient.c
index 7e229c8..1610c3f 100644
--- a/src/apps/uclient/uclient.c
+++ b/src/apps/uclient/uclient.c
@@ -680,6 +680,9 @@ static int client_read(app_ur_session *elem, int is_tcp_data, app_tcp_conn_info
 		  if ((int)elem->in_buffer.len == clmessage_length) {
 		    bcopy((elem->in_buffer.buf), &mi, sizeof(message_info));
 		    miset=1;
+		  } else {
+			/* TODO: make a more clean fix */ 
+			buffers=(int)elem->in_buffer.len / clmessage_length;
 		  }
 		} else if (stun_is_indication(&(elem->in_buffer))) {