diff --git a/build.gradle b/build.gradle
index 466a46b60..7db6fa396 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group = 'org.joml'
-version = '1.9.6-SNAPSHOT'
+version = '1.9.6'
 
 apply plugin: "java"
 
diff --git a/pom.xml b/pom.xml
index 3feaea982..d02863904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.joml</groupId>
 	<artifactId>joml</artifactId>
-	<version>1.9.6-SNAPSHOT</version>
+	<version>1.9.6</version>
 	<name>JOML</name>
 	<description>Java OpenGL Math Library</description>
 	<inceptionYear>2015</inceptionYear>
diff --git a/src/org/joml/MemUtil.java b/src/org/joml/MemUtil.java
index 8438dadfa..b7409d114 100644
--- a/src/org/joml/MemUtil.java
+++ b/src/org/joml/MemUtil.java
@@ -2578,7 +2578,7 @@ static final class MemUtilUnsafe extends MemUtilNIO {
 //#ifdef __HAS_NIO__
         private static long findBufferAddress() {
             String javaVersion = System.getProperty("java.version");
-            if ("9".equals(javaVersion) || "1.9".equals(javaVersion))
+            if (javaVersion != null && javaVersion.startsWith("9") || javaVersion.startsWith("1.9"))
                 return findBufferAddressJDK9(null);
             else
                 return findBufferAddressJDK1();