diff --git a/src/BeSimple/SoapServer/SoapResponseFactory.php b/src/BeSimple/SoapServer/SoapResponseFactory.php
index 2e0e0cd..c10d1ae 100644
--- a/src/BeSimple/SoapServer/SoapResponseFactory.php
+++ b/src/BeSimple/SoapServer/SoapResponseFactory.php
@@ -52,7 +52,7 @@ class SoapResponseFactory
      * @param SoapAttachment[] $attachments SOAP attachments
      * @return Part[]
      */
-    private function createAttachmentParts(array $attachments = [])
+    private static function createAttachmentParts(array $attachments = [])
     {
         $parts = [];
         foreach ($attachments as $attachment) {
diff --git a/src/BeSimple/SoapServer/SoapServer.php b/src/BeSimple/SoapServer/SoapServer.php
index eb81f60..e75b05b 100644
--- a/src/BeSimple/SoapServer/SoapServer.php
+++ b/src/BeSimple/SoapServer/SoapServer.php
@@ -146,7 +146,7 @@ class SoapServer extends \SoapServer
         $handler = $this->soapServerOptions->getHandler();
 
         if ($this->soapOptions->hasAttachments()) {
-            $this->injectAttachmentStorage($handler, $soapRequest, $this->soapOptions->getAttachmentType());
+            $this->injectAttachmentStorage($handler, $soapRequest);
         }
 
         ob_start();
@@ -200,14 +200,14 @@ class SoapServer extends \SoapServer
         return $soapResponse;
     }
 
-    private function injectAttachmentStorage(AttachmentsHandlerInterface $handler, SoapRequest $soapRequest, $attachmentType)
+    private function injectAttachmentStorage(AttachmentsHandlerInterface $handler, SoapRequest $soapRequest)
     {
         $attachments = [];
         if ($soapRequest->hasAttachments()) {
             foreach ($soapRequest->getAttachments() as $attachment) {
                 $attachments[] = new SoapAttachment(
                     $attachment->getHeader('Content-Disposition', 'filename'),
-                    $attachmentType,
+                    $attachment->getHeader('Content-Type'),
                     $attachment->getContent()
                 );
             }