diff --git a/README.md b/README.md
index 0691419df..8fde28bc4 100644
--- a/README.md
+++ b/README.md
@@ -516,7 +516,7 @@ To compile and run the tests, you need to execute
 $ make check
 
 ===============================================================================
-All tests passed (8905168 assertions in 35 test cases)
+All tests passed (8905169 assertions in 35 test cases)
 ```
 
 Alternatively, you can use [https://cmake.org](CMake) and run
diff --git a/src/json.hpp b/src/json.hpp
index 7e7701a93..35a211fc5 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -8960,6 +8960,13 @@ basic_json_parser_63:
             {
                 // parse with strtod
                 result.m_value.number_float = str_to_float_t(static_cast<number_float_t*>(nullptr), NULL);
+
+                // replace infinity and NAN by null
+                if (not std::isfinite(result.m_value.number_float))
+                {
+                    type = value_t::null;
+                    result.m_value = basic_json::json_value();
+                }
             }
 
             // save the type
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index c74bf11f3..b9c538f99 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -8257,6 +8257,13 @@ class basic_json
             {
                 // parse with strtod
                 result.m_value.number_float = str_to_float_t(static_cast<number_float_t*>(nullptr), NULL);
+
+                // replace infinity and NAN by null
+                if (not std::isfinite(result.m_value.number_float))
+                {
+                    type = value_t::null;
+                    result.m_value = basic_json::json_value();
+                }
             }
 
             // save the type
diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp
index 6d93e7440..fee861e9c 100644
--- a/test/src/unit-regression.cpp
+++ b/test/src/unit-regression.cpp
@@ -489,4 +489,10 @@ TEST_CASE("regression tests")
         j["/this/that"_json_pointer] = 27;
         CHECK(j == json({{"this", {{"that", 27}}}}));
     }
+
+    SECTION("issue #329 - serialized value not always can be parsed")
+    {
+        json j = json::parse("22e2222");
+        CHECK(j == json());
+    }
 }