diff --git a/Makefile b/Makefile
index febe890..751c810 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ TARGET	   = psk31test
 
 #Optimalization [0,1,2,3,s]
 # 0 - none optimalization, s - size optimalization 3 - most optimized
-OPT ?= 0
+OPT ?= 2
 
 
 #Common flags 
diff --git a/libpsk/include/psk/modulator.hpp b/libpsk/include/psk/modulator.hpp
index b1c729b..05386ac 100644
--- a/libpsk/include/psk/modulator.hpp
+++ b/libpsk/include/psk/modulator.hpp
@@ -109,7 +109,7 @@ private:
 	//Change this to array
 	std::array<int, 16> m_iq_phase_array {{}};
 	state m_state;
-	bool m_need_shutoff { true };
+	bool m_need_shutoff { false };
 	int m_amble_ptr {};
 	bool m_no_squelch_tail {};
 	fnd::dyn_queue<short> m_chqueue;
diff --git a/psk31test.cpp b/psk31test.cpp
index 171f6bb..d34e39e 100644
--- a/psk31test.cpp
+++ b/psk31test.cpp
@@ -616,6 +616,7 @@ int main(int /*argc*/, const char * const */*argv*/ )
 	const char txt[] = "Ala ma kota a KOT ma ale teraz bedzie nieco dluzszy tekst a im tekst dluzszy tym lepszy";
 	for(size_t i=0;i<sizeof txt -1; i++)
 		ham_digi.tx()->put_tx( txt[i] );
+	ham_digi.tx()->put_tx( psk::ctrl_chars::TX_CNTRL_AUTOSTOP );
 	std::cout << ham_digi.enable( true ) << std::endl;
 	::sleep(2);
 	std::cout << "TRANSMIT " << std::endl;