diff --git a/ChangeLog b/ChangeLog
index 6a7e59fb..9177fbdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+December 19, 2007
++ [FOD] In mqc.h, changed MQC_NUMCTXS from 32 to 19 as there are only 19 possible contexts
+
 December 10, 2007
 + [FOD] First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com). 
 		Thank you Patrick for this new module !
diff --git a/libopenjpeg/mqc.h b/libopenjpeg/mqc.h
index d3c0c5c8..8cc8c934 100644
--- a/libopenjpeg/mqc.h
+++ b/libopenjpeg/mqc.h
@@ -56,7 +56,7 @@ typedef struct opj_mqc_state {
 	struct opj_mqc_state *nlps;
 } opj_mqc_state_t;
 
-#define MQC_NUMCTXS 32
+#define MQC_NUMCTXS 19
 
 /**
 MQ coder