diff --git a/src/TinyGPS++.cpp b/src/TinyGPS++.cpp
index e1ec777..c8bfe24 100644
--- a/src/TinyGPS++.cpp
+++ b/src/TinyGPS++.cpp
@@ -484,7 +484,8 @@ void TinyGPSCustom::commit()
 
 void TinyGPSCustom::set(const char *term)
 {
-   strncpy(this->stagingBuffer, term, sizeof(this->stagingBuffer));
+   strncpy(this->stagingBuffer, term, sizeof(this->stagingBuffer) - 1);
+   stagingBuffer[sizeof(stagingBuffer) - 1] = 0;
 }
 
 void TinyGPSPlus::insertCustom(TinyGPSCustom *pElt, const char *sentenceName, int termNumber)