diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
index 2601f77aea..7ccb9f9297 100644
--- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
+++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
@@ -181,24 +181,14 @@ public class ExtractorFactory {
 			return new XWPFWordExtractor(pkg);
 		}
 
-		if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE)) {
+		if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE) ||
+		      corePart.getContentType().equals(XSLFSlideShow.MACRO_CONTENT_TYPE) ||
+            corePart.getContentType().equals(XSLFSlideShow.MACRO_TEMPLATE_CONTENT_TYPE) ||
+            corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_CONTENT_TYPE) ||
+            corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_TEMPLATE_CONTENT_TYPE) ||
+            corePart.getContentType().equals(XSLFSlideShow.PRESENTATION_MACRO_CONTENT_TYPE)) {
 			return new XSLFPowerPointExtractor(pkg);
 		}
-                if(corePart.getContentType().equals(XSLFSlideShow.MACRO_CONTENT_TYPE)) {
-                        return new XSLFPowerPointExtractor(pkg);
-                }
-                if(corePart.getContentType().equals(XSLFSlideShow.MACRO_TEMPLATE_CONTENT_TYPE)) {
-                        return new XSLFPowerPointExtractor(pkg);
-                }
-                if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_CONTENT_TYPE)) {
-                        return new XSLFPowerPointExtractor(pkg);
-                }
-                if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_TEMPLATE_CONTENT_TYPE)) {
-                        return new XSLFPowerPointExtractor(pkg);
-                }
-                if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATION_MACRO_CONTENT_TYPE)) {
-                        return new XSLFPowerPointExtractor(pkg);
-                }
 
 		throw new IllegalArgumentException("No supported documents found in the OOXML package (found "+corePart.getContentType()+")");
 	}