diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..4fe1004e5630c82056ec851f7ceeb141635c9003
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,22 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added (for new features)
+
+### Changed (for changes in existing functionality)
+
+### Deprecated (for soon-to-be removed features)
+
+### Removed (for now removed features)
+
+### Fixed (for any bug fixes)
+
+- NaN Double Values (see #41)
+
+### Security (in case of vulnerabilities)
+
diff --git a/makefile b/makefile
index 642e31c538a98b39fdb07aeaed5b8a2515adf947..688675fe7a1f73e113f9668b3772f470f365e4f1 100644
--- a/makefile
+++ b/makefile
@@ -32,7 +32,7 @@ runserver:
 run: compile
 	mvn exec:java@run
 
-run-debug:
+run-debug: jar
 	java -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
 
 run-single:
diff --git a/src/main/java/caosdb/server/datatype/GenericValue.java b/src/main/java/caosdb/server/datatype/GenericValue.java
index d6140ff75a80908e0cf82880aeee336a6f21cb87..8e8f1dd41e49305ddba2090b1f897a35a3765f93 100644
--- a/src/main/java/caosdb/server/datatype/GenericValue.java
+++ b/src/main/java/caosdb/server/datatype/GenericValue.java
@@ -44,7 +44,11 @@ public class GenericValue implements SingleValue {
       throw new NullPointerException();
     }
     this.value = d;
-    this.table = Table.double_data;
+    if (d.isNaN()) {
+      this.table = Table.text_data;
+    } else {
+      this.table = Table.double_data;
+    }
   }
 
   public GenericValue(final String s) {