diff --git a/CHANGES b/CHANGES
index 05a5c2f6..b68e256d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+September 2, 2011
+* [mickael] fixed windows nighlty crash about one missing opj_getopt() (and warning with other platform)
+
 September 1st, 2011
 ! [antonin] renamed getopt.{c/h} to opj_getopt.{c/h} and forced the use of these files rather than the system ones. This fixed issue 78. Credit to Winfried.
 
diff --git a/tests/compareRAWimages.c b/tests/compareRAWimages.c
index 24738873..fb037c24 100644
--- a/tests/compareRAWimages.c
+++ b/tests/compareRAWimages.c
@@ -74,7 +74,7 @@ int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
 	param->test_filename = NULL;
 
 	opj_opterr = 0;
-	while ((c = getopt(argc, argv, optlist)) != -1)
+	while ((c = opj_getopt(argc, argv, optlist)) != -1)
 		switch (c)
 		{
 		case 'b':