diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index 431eec81f8b380c48e0b073d485b2942d6c8e818..0277f24de1bc9a9f2e734a430ae71918696db8a6 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -112,6 +112,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
             //hit.getFields().get("textgridUri").getValue().toString().replace(".0", "");
         System.out.println(textgridURI);
         RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
+        
         identifierList.getHeader()
             .add(idiomRecord.getRecordById(textgridURI.replace(".0", "")).getRecord().getHeader());
       }
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index ef0a7e529a5955c0cd5992ca565008bf9361b5fa..98da2c68b3645b7fe169d18c92da989c7087f027 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -181,7 +181,12 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
 
     HeaderType recordHeader = new HeaderType();
     recordHeader.setIdentifier(identifier);
-    recordHeader.setDatestamp(OAIPMHUtilities.datestampAsString(dateOfCreation));
+    if(OAIPMHUtilities.isThisDateValid(dateOfCreation)) {
+    	recordHeader.setDatestamp(OAIPMHUtilities.datestampAsString(dateOfCreation));	
+    }else {
+    	recordHeader.setDatestamp(dateOfCreation);
+    }
+    
     this.record.setHeader(recordHeader);
 
     // recordHeader.setStatus(StatusType.DELETED);