diff --git a/README.html b/README.html
index f756b19c..d029b76c 100644
--- a/README.html
+++ b/README.html
@@ -704,6 +704,10 @@ and LuaForge:
 <tr valign="top"><td>&nbsp;&nbsp;<b>2.0</b></td><td><ul>
 <li>Initial release of 2.0 version  
 </ul></td></tr>
+<tr valign="top"><td>&nbsp;&nbsp;<b>2.0.1</b></td><td><ul>
+<li>Improve correctness of singleton construction related to static initialization
+<li>Fix nan-related error in constant folding logic that was failing on some JVMs
+</ul></td></tr>
 </table>
 
 <h2>Known Issues</h2>
diff --git a/src/core/org/luaj/vm2/compiler/FuncState.java b/src/core/org/luaj/vm2/compiler/FuncState.java
index 85fd5c35..81ae24de 100644
--- a/src/core/org/luaj/vm2/compiler/FuncState.java
+++ b/src/core/org/luaj/vm2/compiler/FuncState.java
@@ -861,7 +861,7 @@ public class FuncState extends LuaC {
 			r = null;
 			break;
 		}
-		if (Double.NaN == r.todouble())
+		if ( Double.isNaN(r.todouble()) )
 			return false; /* do not attempt to produce NaN */
 		e1.u.setNval( r );
 		return true;