diff --git a/bsp_linux/comIF/P60DockComIF.cpp b/bsp_linux/comIF/P60DockComIF.cpp
index d37e652b..7445c03b 100644
--- a/bsp_linux/comIF/P60DockComIF.cpp
+++ b/bsp_linux/comIF/P60DockComIF.cpp
@@ -122,11 +122,10 @@ ReturnValue_t P60DockComIF::readReceivedMessage(CookieIF *cookie,
 	case(P60DockCookie::READ_HK):{
 		uint32_t timeout = 1000;
 		uint8_t p60dockAddress = p60DockCookie->getCspAddress();
-		gs_param_table_instance_t tmData;
 		tmData.rows = (gs_param_table_row_t*)p60dock_hk;
 		tmData.id = tmTableNum;
 		tmData.row_count = p60dock_hk_count;
-		tmData.memory_size = tmTableSize;
+		tmData.memory_size = P60DOCK_HK_SIZE;
 		tmData.memory = replyBuffer;
 		/* Read complete module configuration table from P60 Dock and store data
 		 * in buffer */
diff --git a/bsp_linux/comIF/P60DockComIF.h b/bsp_linux/comIF/P60DockComIF.h
index 411b3b99..3279f64e 100644
--- a/bsp_linux/comIF/P60DockComIF.h
+++ b/bsp_linux/comIF/P60DockComIF.h
@@ -51,7 +51,8 @@ private:
 	unsigned int moduleConfigTableRows = 32;
 	uint8_t moduleCfgTableSize = 188;
 	uint8_t tmTableSize = 188;
-	uint8_t replyBuffer[P60DockComIF::maxReplyLength];
+	uint8_t replyBuffer[188];
+	gs_param_table_instance_t tmData;
 
 };