diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h
index 11c8d64..ac37f38 100644
--- a/libraries/MySensors/MySensor.h
+++ b/libraries/MySensors/MySensor.h
@@ -28,8 +28,10 @@
 	#define MY_IS_GATEWAY (true)
 	#define MY_NODE_TYPE "gateway"
 #elif defined(MY_REPEATER_FEATURE)
+	#define MY_IS_GATEWAY (false)
 	#define MY_NODE_TYPE "repeater"
 #else
+	#define MY_IS_GATEWAY (false)
 	#define MY_NODE_TYPE "sensor"
 #endif
 
diff --git a/libraries/MySensors/core/MyTransport.cpp b/libraries/MySensors/core/MyTransport.cpp
index 5b1cbe1..84f11c7 100644
--- a/libraries/MySensors/core/MyTransport.cpp
+++ b/libraries/MySensors/core/MyTransport.cpp
@@ -90,7 +90,7 @@ inline void transportProcess() {
 		#ifdef MY_SIGNING_REQUEST_SIGNATURES
 
 			if ((!MY_IS_GATEWAY || DO_SIGN(sender)) &&
-				destination == nc.nodeId &&
+				destination == _nc.nodeId &&
 				mGetLength(_msg) &&
 				!mGetAck(_msg) &&
 				(mGetCommand(_msg) != C_INTERNAL ||