diff --git a/src/obi_ecopcr.c b/src/obi_ecopcr.c
index 8c7a90e..7e5097c 100755
--- a/src/obi_ecopcr.c
+++ b/src/obi_ecopcr.c
@@ -1054,8 +1054,7 @@ int obi_ecopcr(const char* i_dms_name,
 											if (posj > posi)
 												length = posj - posi - o1->patlen - o2->patlen;
 											if (posj < posi)
-												//length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;   // TODO hein????
-												length = posi - posj - o1->patlen - o2->patlen;
+												length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
 											if ((length>0) &&	// For when primers touch or overlap
 												(!min_len || (length >= min_len)) &&
 												(!max_len || (length <= max_len)))
@@ -1140,11 +1139,9 @@ int obi_ecopcr(const char* i_dms_name,
 
 											length = 0;
 											if (posj > posi)
-												//length = posj - posi + 1  - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */ TODO ????
-												length = posj - posi - o2->patlen - o1->patlen;
+												length = posj - posi + 1  - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */
 											if (posj < posi)
-												//length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; TODO ????
-												length = posi - posj - o2->patlen - o1->patlen;
+												length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
 											if ((length>0) &&	// For when primers touch or overlap
 												(!min_len || (length >= min_len)) &&
 												(!max_len || (length <= max_len)))