diff --git a/source/MsgBusTestServer/cosa_MsgBusTest_dml.c b/source/MsgBusTestServer/cosa_MsgBusTest_dml.c
index 9917c92..a34079f 100644
--- a/source/MsgBusTestServer/cosa_MsgBusTest_dml.c
+++ b/source/MsgBusTestServer/cosa_MsgBusTest_dml.c
@@ -82,7 +82,8 @@ BOOL MsgBusTest_SetParamStringValue(ANSC_HANDLE hInsContext, char* ParamName, ch
     ERR_CHK(rc);
     if ((!ind) && (rc == EOK))
     {
-	AnscCopyString(ParamString, strValue);
+        memset(ParamString, 0, sizeof(ParamString));
+        strncpy(ParamString, strValue, (sizeof(ParamString) - 1));
 	   
         return TRUE;
     }
diff --git a/source/MsgBusTestServer/ssp_main.c b/source/MsgBusTestServer/ssp_main.c
index c9742a6..a4c9a2e 100644
--- a/source/MsgBusTestServer/ssp_main.c
+++ b/source/MsgBusTestServer/ssp_main.c
@@ -201,7 +201,7 @@ int main(int argc, char* argv[])
     {
         if ((strcmp(argv[idx], "-subsys") == 0))
         {
-            AnscCopyString(g_Subsystem, argv[idx+1]);
+            strncpy(g_Subsystem, argv[idx+1], (sizeof(g_Subsystem) - 1));
         }
         else if (strcmp(argv[idx], "-c") == 0)
         {