diff --git a/examples/LoRaSimpleGateway/LoRaSimpleGateway.ino b/examples/LoRaSimpleGateway/LoRaSimpleGateway.ino
index 745bf1f..95d84a7 100644
--- a/examples/LoRaSimpleGateway/LoRaSimpleGateway.ino
+++ b/examples/LoRaSimpleGateway/LoRaSimpleGateway.ino
@@ -53,6 +53,7 @@ void setup() {
   Serial.println();
 
   LoRa.onReceive(onReceive);
+  LoRa.onTxDone(onTxDone);
   LoRa_rxMode();
 }
 
@@ -83,8 +84,7 @@ void LoRa_sendMessage(String message) {
   LoRa_txMode();                        // set tx mode
   LoRa.beginPacket();                   // start packet
   LoRa.print(message);                  // add payload
-  LoRa.endPacket();                     // finish packet and send it
-  LoRa_rxMode();                        // set rx mode
+  LoRa.endPacket(true);                 // finish packet and send it
 }
 
 void onReceive(int packetSize) {
@@ -96,7 +96,11 @@ void onReceive(int packetSize) {
 
   Serial.print("Gateway Receive: ");
   Serial.println(message);
+}
 
+void onTxDone() {
+  Serial.println("TxDone");
+  LoRa_rxMode();
 }
 
 boolean runEvery(unsigned long interval)
diff --git a/examples/LoRaSimpleNode/LoRaSimpleNode.ino b/examples/LoRaSimpleNode/LoRaSimpleNode.ino
index a6cb0c0..db8c6fa 100644
--- a/examples/LoRaSimpleNode/LoRaSimpleNode.ino
+++ b/examples/LoRaSimpleNode/LoRaSimpleNode.ino
@@ -53,6 +53,7 @@ void setup() {
   Serial.println();
 
   LoRa.onReceive(onReceive);
+  LoRa.onTxDone(onTxDone);
   LoRa_rxMode();
 }
 
@@ -83,8 +84,7 @@ void LoRa_sendMessage(String message) {
   LoRa_txMode();                        // set tx mode
   LoRa.beginPacket();                   // start packet
   LoRa.print(message);                  // add payload
-  LoRa.endPacket();                     // finish packet and send it
-  LoRa_rxMode();                        // set rx mode
+  LoRa.endPacket(true);                 // finish packet and send it
 }
 
 void onReceive(int packetSize) {
@@ -96,7 +96,11 @@ void onReceive(int packetSize) {
 
   Serial.print("Node Receive: ");
   Serial.println(message);
+}
 
+void onTxDone() {
+  Serial.println("TxDone");
+  LoRa_rxMode();
 }
 
 boolean runEvery(unsigned long interval)