diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp
index b87a4c455..6e85c5490 100644
--- a/libraries/MySensors/MySensor.cpp
+++ b/libraries/MySensors/MySensor.cpp
@@ -620,6 +620,7 @@ boolean MySensor::process() {
 	if (destination == nc.nodeId) {
 		// This message is addressed to this node
 		mSetSigned(msg,0);
+		msg.data[mGetLength(msg)] = '\0'; // Add NULL termination so that "getters" works as expected
 
 		if (repeaterMode && last != nc.parentNodeId) {
 			// Message is from one of the child nodes. Add it to routing table.
diff --git a/libraries/MySensors/Version.h b/libraries/MySensors/Version.h
index 79efa67d7..bb45df07b 100644
--- a/libraries/MySensors/Version.h
+++ b/libraries/MySensors/Version.h
@@ -6,6 +6,6 @@
 #ifndef Version_h
 #define Version_h
 
-#define LIBRARY_VERSION "1.5.3"
+#define LIBRARY_VERSION "1.5.4"
 
 #endif