diff --git a/src/modules/modem/digital/ModemPSK.cpp b/src/modules/modem/digital/ModemPSK.cpp
index 33ca3cd..3a75f14 100644
--- a/src/modules/modem/digital/ModemPSK.cpp
+++ b/src/modules/modem/digital/ModemPSK.cpp
@@ -1,8 +1,6 @@
 #include "ModemPSK.h"
 
 ModemPSK::ModemPSK() {
-    
-    demodPSK = demodPSK2;
     demodPSK2 = modem_create(LIQUID_MODEM_PSK2);
     demodPSK4 = modem_create(LIQUID_MODEM_PSK4);
     demodPSK8 = modem_create(LIQUID_MODEM_PSK8);
@@ -11,6 +9,7 @@ ModemPSK::ModemPSK() {
     demodPSK64 = modem_create(LIQUID_MODEM_PSK64);
     demodPSK128 = modem_create(LIQUID_MODEM_PSK128);
     demodPSK256 = modem_create(LIQUID_MODEM_PSK256);
+    demodPSK = demodPSK2;
 }
 
 Modem *ModemPSK::factory() {
diff --git a/src/modules/modem/digital/ModemSQAM.cpp b/src/modules/modem/digital/ModemSQAM.cpp
index 8c68dff..3721bea 100644
--- a/src/modules/modem/digital/ModemSQAM.cpp
+++ b/src/modules/modem/digital/ModemSQAM.cpp
@@ -1,9 +1,9 @@
 #include "ModemSQAM.h"
 
 ModemSQAM::ModemSQAM() {
-    demodSQAM = demodSQAM32;
     demodSQAM32 = modem_create(LIQUID_MODEM_SQAM32);
     demodSQAM128 = modem_create(LIQUID_MODEM_SQAM128);
+    demodSQAM = demodSQAM32;
 }
 
 Modem *ModemSQAM::factory() {
diff --git a/src/modules/modem/digital/ModemST.cpp b/src/modules/modem/digital/ModemST.cpp
index 6091c27..480a215 100644
--- a/src/modules/modem/digital/ModemST.cpp
+++ b/src/modules/modem/digital/ModemST.cpp
@@ -8,7 +8,6 @@ Modem *ModemST::factory() {
     return new ModemST;
 }
 
-
 ModemST::~ModemST() {
     modem_destroy(demodST);
 }