diff --git a/Changelog b/Changelog
index 01e8394b8..89d064230 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@
     - BUGFIX: Progress of paused torrents is now correct on restart
     - BUGFIX: Progress column gets sorted on restart it is was during last execution
     - BUGFIX: Made ETA more reliable using stats instead of instant values
+    - BUGFIX: Remove torrent from hard drive used to delete parent folder if empty
     - COSMETIC: Redesigned torrent properties a little
     - COSMETIC: Redesigned options a little
     - COSMETIC: Display more logs messages concerning features
diff --git a/TODO b/TODO
index 9a48b3c9c..bb77ba6fa 100644
--- a/TODO
+++ b/TODO
@@ -46,4 +46,5 @@
 - Allow to scan multiple directories
 - Fix all (or almost all) opened bugs in bug tracker
 - Fix sorting with Qt 4.3 - Reported to Trolltech, waiting for fix
-- update sorting when a new torrent is added
\ No newline at end of file
+- update sorting when a new torrent is added
+- fix file filtering in a torrent
\ No newline at end of file
diff --git a/src/PropListDelegate.h b/src/PropListDelegate.h
index 97e3dc499..bd9e96e67 100644
--- a/src/PropListDelegate.h
+++ b/src/PropListDelegate.h
@@ -186,7 +186,6 @@ class PropListDelegate: public QItemDelegate {
     public slots:
     void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const {
       QComboBox *combobox = static_cast<QComboBox*>(editor);
-//       combobox->interpretText();
       int value = combobox->currentIndex();
       qDebug("Setting combobox value in index: %d", value);
       QString color;
diff --git a/src/misc.h b/src/misc.h
index 903db023e..cf973a05e 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -116,7 +116,7 @@ class misc : public QObject{
             }
           }
           // Remove empty folder
-          if(current_dir.rmpath(path)){
+          if(current_dir.rmdir(path)){
             return true;
           }else{
             return false;