     #ifdef DEBUG
       Serial.println("M-command received.");
     #endif    
-    while(!RFduinoBLE.radioActive){} 
+    #ifdef RFD
+      while ( RFduinoBLE.radioActive );
+    #else
+      while ( SimbleeBLE.radioActive );
+    #endif
     delay(6);
     eraseData();
     writeData();

  if (protocolType == 1) SimbleeBLE.deviceName = LB_NAME;
#ifdef USE_XBRIDGE2
  Serial.print(" - setting xbridge/wixel device");
  SimblleBLE.advertisementData = LB_ADVERT;
  SimbleeBLE.customUUID = "0000ffe0-0000-1000-8000-00805f9b34fb";
#else /* USE_XBRIDGE2 */
  Serial.print(" - setting LimiTTer device");

    #ifdef DEBUG
      Serial.println("V-command received.");
      Serial.println(v);
    #endif   
    #ifdef RFD
      RFduinoBLE.send(v.cstr(), v.length());
    #else
      SimbleeBLE.send(v.cstr(), v.length());
    #endif
    displayData();
  }
  if ( toupper(command_buff.commandBuffer[0]) == 'M' ) {
