diff --git a/filters/odg/visio/import/VSDXImport.cpp b/filters/odg/visio/import/VSDXImport.cpp
index 7146e181d45..dc77f0e7f78 100644
--- a/filters/odg/visio/import/VSDXImport.cpp
+++ b/filters/odg/visio/import/VSDXImport.cpp
@@ -1,138 +1,141 @@
 /* This file is part of the KDE project
  *
  * Based on writerperfect code, major Contributor(s):
  * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
  * Copyright (C) 2006-2007 Fridrich Strba (fridrich.strba@bluewin.ch)
  *
  * For minor contributions see the writerperfect git repository.
  *
  * The contents of this file may be used under the terms
  * of the GNU Lesser General Public License Version 2.1 or later
  * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
  * applicable instead of those above.
  *
  * For further information visit http://libwpd.sourceforge.net
  */
 
 #include "VSDXImport.h"
 
 #include <libvisio/libvisio.h>
 #include <libodfgen/libodfgen.hxx>
 
 #include <writerperfect_utils.hxx>
 #include <OutputFileHelper.hxx>
 #include <StringDocumentHandler.hxx>
 
 #include <KoFilterChain.h>
 #include <KoOdf.h>
 
 #include <kpluginfactory.h>
 
 #include <QString>
 #include <QByteArray>
 
 #include <stdio.h>
 
 class OdgOutputFileHelper : public OutputFileHelper
 {
 public:
     OdgOutputFileHelper(const char *outFileName, const char *password) :
         OutputFileHelper(outFileName, password) {}
     ~OdgOutputFileHelper() {}
 
     bool convertDocument(librevenge::RVNGInputStream &input, bool isFlat)
     {
         OdgGenerator collector;
         StringDocumentHandler stylesHandler, contentHandler, manifestHandler, settingsHandler;
         if (isFlat)
             collector.addDocumentHandler(&contentHandler, ODF_FLAT_XML);
         else
         {
             collector.addDocumentHandler(&contentHandler, ODF_CONTENT_XML);
             collector.addDocumentHandler(&manifestHandler, ODF_MANIFEST_XML);
             collector.addDocumentHandler(&settingsHandler, ODF_SETTINGS_XML);
             collector.addDocumentHandler(&stylesHandler, ODF_STYLES_XML);
         }
         try
         {
             if (!libvisio::VisioDocument::parse(&input, &collector))
                 return false;
         }
         catch (...)
         {
             return false;
         }
         if (isFlat)
         {
             printf("%s\n", contentHandler.cstr());
             return true;
         }
 
         const char s_mimetypeStr[] = "application/vnd.oasis.opendocument.graphics";
         if (!writeChildFile("mimetype", s_mimetypeStr, (char)0) ||
                 !writeChildFile("META-INF/manifest.xml", manifestHandler.cstr()) ||
                 !writeChildFile("content.xml", contentHandler.cstr()) ||
                 !writeChildFile("settings.xml", settingsHandler.cstr()) ||
                 !writeChildFile("styles.xml", stylesHandler.cstr()))
             return false;
 
         librevenge::RVNGStringVector objects=collector.getObjectNames();
         for (unsigned i=0; i<objects.size(); ++i)
         {
             StringDocumentHandler objectHandler;
             if (collector.getObjectContent(objects[i], &objectHandler))
                 writeChildFile(objects[i].cstr(), objectHandler.cstr());
         }
         return true;
     }
     bool isSupportedFormat(librevenge::RVNGInputStream &input)
     {
         try
         {
             return libvisio::VisioDocument::isSupported(&input);
         }
         catch (...)
         {
             return false;
         }
     }
 private:
 };
 
 K_PLUGIN_FACTORY_WITH_JSON(VSDXImportFactory, "calligra_filter_vsdx2odg.json", registerPlugin<VSDXImport>();)
 
 VSDXImport::VSDXImport(QObject* parent, const QVariantList&)
         : KoFilter(parent)
 {
 }
 
 VSDXImport::~VSDXImport()
 {
 }
 
 KoFilter::ConversionStatus VSDXImport::convert(const QByteArray& from, const QByteArray& to)
 {
     if (from != QByteArrayLiteral("application/vnd.visio") || to != KoOdf::mimeType(KoOdf::Graphics))
         return KoFilter::NotImplemented;
 
     QByteArray inputFile = m_chain->inputFile().toLocal8Bit();
     QByteArray outputFile = m_chain->outputFile().toLocal8Bit();
 
     OdgOutputFileHelper helper(outputFile.constData(), nullptr);
     librevenge::RVNGFileStream input(inputFile.constData());
     if (!helper.isSupportedFormat(input))
     {
         fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Visio Document.\n");
         return KoFilter::ParsingError;
     }
-
-    if (!helper.convertDocument(input, outputFile.constData()))
+    // NOTE:
+    // Flat files are not supported, see convertDocument() above
+    // Setting flat to false makes some formats work (2002 and 2013 have been tested)
+    bool isFlat = false;
+    if (!helper.convertDocument(input, isFlat))
     {
         fprintf(stderr, "ERROR : Couldn't write convert the document\n");
         return KoFilter::ParsingError;
     }
 
     return KoFilter::OK;
 }
 
 #include "VSDXImport.moc"