diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
index 2b0bc86078012c8e28b77d8103d53cbe2f783b81..a200aed09f8e2d608cc42219bcf79a3efe412361 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
@@ -658,7 +658,10 @@ class CepStorageCmd : public Command
         virtual ~CepStorageCmd() { }
         virtual void send();
         virtual GCFEvent::TResult ack(GCFEvent& e);
-        void setStorageNode(char *storagenode) { strcpy(itsStorageNode,storagenode); }
+        void setStorageNode(char *storagenode) {
+          strncpy(itsStorageNode, storagenode, sizeof itsStorageNode);
+          itsStorageNode[sizeof itsStorageNode - 1] = 0;
+        }
     private:
         char itsStorageNode[10];
 };