diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index c6c4217daf1d092554576311bf0c98728bf09b67..d28b135867946d6608fd50b934e675475ada1726 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>2.16.0-SNAPSHOT</version>
+		<version>2.16.0</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index 5aa0ffb0e61548108bfb5edc08173df382706402..d9549991a32c59049bb91f18da8b8dc7feb492c0 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -100,13 +100,15 @@ public class SetDeliverer {
       }
     }
 
-    Iterator it = setSet.entrySet().iterator();
-    while (it.hasNext()) {
-      Map.Entry pair = (Map.Entry) it.next();
-      SetType set = new SetType();
-      set.setSetName(pair.getValue().toString());
-      set.setSetSpec("project:" + pair.getKey().toString());
-      setList.getSet().add(set);
+    if (this.textgrid == true) {
+      Iterator it = setSet.entrySet().iterator();
+      while (it.hasNext()) {
+        Map.Entry pair = (Map.Entry) it.next();
+        SetType set = new SetType();
+        set.setSetName(pair.getValue().toString());
+        set.setSetSpec("project:" + pair.getKey().toString());
+        setList.getSet().add(set);
+      }
     }
 
     if (this.dariah == true) {
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 4f01dc00fe997eb359e76052edec094d3d3031bb..fccf9cd02ccea3a3f9a1ad98047d3af7409bdd57 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>2.16.0-SNAPSHOT</version>
+		<version>2.16.0</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index aa53e136ee8081fe8477cf74032a178e68dce2ff..e4b25cdc11335d53e20045357c0eed740d8c2f2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh</artifactId>
-	<version>2.16.0-SNAPSHOT</version>
+	<version>2.16.0</version>
 	<packaging>pom</packaging>
 	<name>DARIAHDE :: OAI-PMH DataProvider</name>
 	<properties>