diff --git a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp
index 1e0d0abc6..0c8355fbb 100644
--- a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp
+++ b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.cpp
@@ -44,8 +44,7 @@ FuzzyIndex::FuzzyIndex( QObject* parent, const QString& filename, bool wipe )
     try
     {
         m_analyzer = newLucene<SimpleAnalyzer>();
-        m_luceneDir = FSDirectory::open( StringUtils::toString( m_lucenePath.utf16() ) );
-//        m_luceneDir = FSDirectory::open( m_lucenePath.toStdWString() );
+        m_luceneDir = FSDirectory::open( m_lucenePath.toStdWString() );
     }
     catch ( LuceneException& error )
     {
diff --git a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h
index a5bae0685..4780bb882 100644
--- a/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h
+++ b/src/libtomahawk/database/fuzzyindex/FuzzyIndex.h
@@ -71,7 +71,7 @@ private:
     boost::shared_ptr<Lucene::SimpleAnalyzer> m_analyzer;
     Lucene::IndexWriterPtr m_luceneWriter;
     Lucene::IndexReaderPtr m_luceneReader;
-    Lucene::DirectoryPtr m_luceneDir;
+    Lucene::FSDirectoryPtr m_luceneDir;
     Lucene::IndexSearcherPtr m_luceneSearcher;
 };