diff --git a/common.h b/common.h
index 5835792..d4c93d8 100644
--- a/common.h
+++ b/common.h
@@ -14,13 +14,13 @@
 #define VERIFIERPORT 6592
 
 #define MAX_CLIENTS 10
+#define MAX_BSNSIZE 128
+#define NONCE_SIZE 64
 #define MAX_MSGSIZE 15000
 #define MAX_CHKSUMSIZE 1024
-#define MAX_BUFSIZE (((MAX_MSGSIZE + 2) / 3) * 4) + (((MAX_CHKSUMSIZE + 2) / 3) * 4) + 1536
+#define MAX_BUFSIZE (((MAX_MSGSIZE + 2) / 3) * 4) + (((MAX_CHKSUMSIZE + 2) / 3) * 4) + 2048 
 /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 2) - MAX_CHKSUMSIZE //for bin to hex*/
 /* #define MAX_MSGSIZE ((MAX_BUFSIZE - 1536) / 4 * 3) - MAX_CHKSUMSIZE //for base64 */
-#define MAX_BSNSIZE 128
-#define NONCE_SIZE 64
 
 #define ISSUER_PUBLIC_KEY_FILE "ipk.bin"
 #define ISSUER_SECRET_KEY_FILE "isk.bin"