diff --git a/decode.cc b/decode.cc
index b8d7ed6..0e94939 100644
--- a/decode.cc
+++ b/decode.cc
@@ -254,15 +254,15 @@ struct Decoder
 	}
 	cmplx mod_map(code_type *b)
 	{
-		return QuadratureAmplitudeModulation<16, cmplx, code_type>::map(b);
+		return QuadratureAmplitudeModulation<1 << mod_bits, cmplx, code_type>::map(b);
 	}
 	void mod_hard(code_type *b, cmplx c)
 	{
-		QuadratureAmplitudeModulation<16, cmplx, code_type>::hard(b, c);
+		QuadratureAmplitudeModulation<1 << mod_bits, cmplx, code_type>::hard(b, c);
 	}
 	void mod_soft(code_type *b, cmplx c, value precision)
 	{
-		QuadratureAmplitudeModulation<16, cmplx, code_type>::soft(b, c, precision);
+		QuadratureAmplitudeModulation<1 << mod_bits, cmplx, code_type>::soft(b, c, precision);
 	}
 	const cmplx *next_sample()
 	{
diff --git a/encode.cc b/encode.cc
index 919cc60..dee5133 100644
--- a/encode.cc
+++ b/encode.cc
@@ -191,7 +191,7 @@ struct Encoder
 	}
 	cmplx mod_map(code_type *b)
 	{
-		return QuadratureAmplitudeModulation<16, cmplx, code_type>::map(b);
+		return QuadratureAmplitudeModulation<1 << mod_bits, cmplx, code_type>::map(b);
 	}
 	Encoder(DSP::WritePCM<value> *pcm, const uint8_t *inp, int freq_off, uint64_t call_sign, int oper_mode, int reserved_tones) :
 		pcm(pcm), crc0(0xA8F4), crc1(0x8F6E37A0), bchenc({