diff --git a/examples/SX127x_RTTY_Transmit/SX127x_RTTY_Transmit.ino b/examples/SX127x_RTTY_Transmit/SX127x_RTTY_Transmit.ino
index 274ff11b..5823f969 100644
--- a/examples/SX127x_RTTY_Transmit/SX127x_RTTY_Transmit.ino
+++ b/examples/SX127x_RTTY_Transmit/SX127x_RTTY_Transmit.ino
@@ -61,7 +61,7 @@ void setup() {
 }
 
 void loop() {
-  Serial.println(F("Sending RTTY data ... "));
+  Serial.print(F("[RTTY] Sending RTTY data ... "));
   
   // send out idle condition for 500 ms
   rtty.idle();
diff --git a/src/protocols/RTTY.cpp b/src/protocols/RTTY.cpp
index cd522f3c..9f31c234 100644
--- a/src/protocols/RTTY.cpp
+++ b/src/protocols/RTTY.cpp
@@ -52,7 +52,7 @@ size_t RTTYClient::write(uint8_t* buff, size_t len) {
 size_t RTTYClient::write(uint8_t b) {
   space();
   
-  for(uint8_t mask = 0x01; mask; mask <<= 1) {
+  for(uint16_t mask = 0x01; mask <= (0x01 << (_dataBits - 1)); mask <<= 1) {
     if(b & mask) {
       mark();
     } else {