diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index 18ad2b061..edd3b8aef 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -55,7 +55,9 @@ QString QTorrentHandle::name() const {
 
 float QTorrentHandle::progress() const {
   Q_ASSERT(h.is_valid());
-  float progress = h.status().progress;
+  if(!h.status().total_wanted)
+    return 0.;
+  float progress = (float)h.status().total_wanted_done/(float)h.status().total_wanted;
   Q_ASSERT(progress >= 0. && progress <= 1.);
   return progress;
 }
diff --git a/src/src.pro b/src/src.pro
index 49d799618..9d65702ed 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -32,7 +32,7 @@ contains(DEBUG_MODE, 0){
 
 # For libtorrent stuff
 # (comment this if you are using libtorrent with debug enabled)
-#DEFINES += NDEBUG
+DEFINES += NDEBUG
 
 # Install