diff --git a/libcelt/celt.c b/libcelt/celt.c
index 2738d3ed..b9ba9ecc 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -61,7 +61,7 @@ static const unsigned char spread_icdf[4] = {25, 23, 2, 0};
 static const unsigned char tapset_icdf[3]={2,1,0};
 
 #define COMBFILTER_MAXPERIOD 1024
-#define COMBFILTER_MINPERIOD 16
+#define COMBFILTER_MINPERIOD 15
 
 /** Encoder state 
  @brief Encoder state
diff --git a/libcelt/pitch.c b/libcelt/pitch.c
index 50a60171..92cdd272 100644
--- a/libcelt/pitch.c
+++ b/libcelt/pitch.c
@@ -253,7 +253,9 @@ celt_word16 remove_doubling(celt_word16 *x, int maxperiod, int minperiod,
    celt_word32 xcorr[3];
    celt_word32 best_xy, best_yy;
    int offset;
+   int minperiod0;
 
+   minperiod0 = minperiod;
    maxperiod /= 2;
    minperiod /= 2;
    *_T0 /= 2;
@@ -364,8 +366,8 @@ celt_word16 remove_doubling(celt_word16 *x, int maxperiod, int minperiod,
       pg = g;
    *_T0 = 2*T+offset;
 
-   if (*_T0<2*minperiod)
-      *_T0=2*minperiod;
+   if (*_T0<minperiod0)
+      *_T0=minperiod0;
    return pg;
 }