diff --git a/scripts/setup_fuzzer.sh b/scripts/setup_fuzzer.sh
index 33434f4..7db1cbc 100755
--- a/scripts/setup_fuzzer.sh
+++ b/scripts/setup_fuzzer.sh
@@ -8,7 +8,7 @@ readonly BASE_DIR
 setup_psf() {
     # setup protocol-state-fuzzer library
 
-    CHECKOUT="d665cb9d4396ced98131df70adb445150b4d3704"
+    CHECKOUT="d4d5730bbd9f7f93d8e9eee5165592586e03c833"
 
     set -e
     cd "${BASE_DIR}"
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java
index 93fd5c2..27c8ab3 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java
@@ -28,7 +28,7 @@ protected void sendMessage(EdhocProtocolMessage message, EdhocExecutionContext c
         // enable or disable content format
         EdhocMapperConfig edhocMapperConfig = (EdhocMapperConfig) mapperConfig;
         int contentFormat = edhocMapperConfig.useContentFormat() ?
-            edhocProtocolMessage.getContentFormat(edhocMapperConfig.useOldContentFormat()) :
+            message.getContentFormat(edhocMapperConfig.useOldContentFormat()) :
             MediaTypeRegistry.UNDEFINED;
 
         edhocMapperConnector.send(message.getPayload(), message.getPayloadType(), message.getMessageCode(), contentFormat);