diff --git a/Controller.cpp b/Controller.cpp
index 10f8bb3..e39bd92 100644
--- a/Controller.cpp
+++ b/Controller.cpp
@@ -377,11 +377,10 @@ void CController::Codec2toAudio(std::shared_ptr<CTranscoderPacket> packet)
 
 #ifdef USE_SW_AMBE2
 	md380_encode_fec(ambe2, packet->GetAudioSamples());
+	packet->SetDMRData(ambe2);
 #else
 	dmrsf_device->AddPacket(packet);
 #endif
-	
-	packet->SetDMRData(ambe2);
 	p25vocoder.encode_4400((int16_t*)packet->GetAudioSamples(), imbe);
 	packet->SetP25Data(imbe);
 	packet->SetUSRPData((int16_t*)packet->GetAudioSamples());
diff --git a/Makefile b/Makefile
index a616efb..9ae6c79 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include configure.mk
 # need to update the systemd service script
 BINDIR = /usr/local/bin
 
-swambe2 = false
+swambe2 = true
 
 GCC = g++