diff --git a/oai2server.php b/oai2server.php
index 0faabac..9381fba 100644
--- a/oai2server.php
+++ b/oai2server.php
@@ -244,7 +244,7 @@ class OAI2Server {
 
     private function createResumptionToken($deliveredRecords, $metadataPrefix, $from, $until) {
         list($usec, $sec) = explode(' ', microtime());
-        $token = ((int)($usec*1000) + (int)($sec*1000)).'#'.$metadataPrefix;
+        $token = ((int)($usec*1000) + (int)($sec*1000)).'_'.$metadataPrefix;
         $file = fopen($this->token_prefix.$token, 'w');
         if($file == false) {
             exit('Cannot write resumption token. Writing permission needs to be changed.');
diff --git a/oai2transform.xsl b/oai2transform.xsl
index e0533ad..e244642 100644
--- a/oai2transform.xsl
+++ b/oai2transform.xsl
@@ -142,7 +142,7 @@
     <xsl:variable name='metadataPrefix' select="/oai:OAI-PMH/oai:request/@metadataPrefix"/>
   </xsl:if>
   <xsl:if test="/oai:OAI-PMH/oai:request/@resumptionToken">
-    <xsl:variable name='metadataPrefix' select="substring-after(/oai:OAI-PMH/oai:request/@resumptionToken,'#')"/>
+    <xsl:variable name='metadataPrefix' select="substring-after(/oai:OAI-PMH/oai:request/@resumptionToken,'_')"/>
   </xsl:if>
   <xsl:variable name='from' select="/oai:OAI-PMH/oai:request/@from"/>
   <xsl:variable name='until' select="/oai:OAI-PMH/oai:request/@until"/>