diff --git a/Changelog b/Changelog
index f1e873ff0..7804eb8de 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.0.5
+    - BUGFIX: Fix possible crash when drawing piece downloaded/availability bars
+
 * Wed Dec 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.4
     - BUGFIX: Fix PeerGuardian .p2b binary filter support
     - BUGFIX: Fix possible crash when closing a search engine tab
diff --git a/src/downloadedpiecesbar.h b/src/downloadedpiecesbar.h
index 8ab6b1a65..6f4788b66 100644
--- a/src/downloadedpiecesbar.h
+++ b/src/downloadedpiecesbar.h
@@ -55,13 +55,13 @@ public:
   void setProgress(bitfield pieces) {
     if(pieces.empty()) {
       // Empty bar
-      pixmap = QPixmap(1, 1);
-      QPainter painter(&pixmap);
-      painter.setPen(Qt::white);
-      painter.drawPoint(0,0);
+      QPixmap pix = QPixmap(1, 1);
+      pix.fill();
+      pixmap = pix;
     } else {
-      pixmap = QPixmap(pieces.size(), 1);
-      QPainter painter(&pixmap);
+      QPixmap pix = QPixmap(pieces.size(), 1);
+      pix.fill();
+      QPainter painter(&pix);
       for(uint i=0; i<pieces.size(); ++i) {
         if(pieces[i])
           painter.setPen(Qt::blue);
@@ -69,6 +69,7 @@ public:
           painter.setPen(Qt::white);
         painter.drawPoint(i,0);
       }
+      pixmap = pix;
     }
     update();
   }
diff --git a/src/pieceavailabilitybar.h b/src/pieceavailabilitybar.h
index 5fb7a0a6a..144ed5727 100644
--- a/src/pieceavailabilitybar.h
+++ b/src/pieceavailabilitybar.h
@@ -54,21 +54,22 @@ public:
     double average = 0;
     if(avail.empty()) {
       // Empty bar
-      pixmap = QPixmap(1, 1);
-      QPainter painter(&pixmap);
-      painter.setPen(Qt::white);
-      painter.drawPoint(0,0);
+      QPixmap pix = QPixmap(1, 1);
+      pix.fill();
+      pixmap = pix;
     } else {
       // Look for maximum value
       average = std::accumulate(avail.begin(), avail.end(), 0)/(double)avail.size();
       uint nb_pieces = avail.size();
-      pixmap = QPixmap(nb_pieces, 1);
-      QPainter painter(&pixmap);
+      QPixmap pix = QPixmap(nb_pieces, 1);
+      pix.fill();
+      QPainter painter(&pix);
       std::vector<int>::iterator it;
       for(uint i=0; i < nb_pieces; ++i) {
         painter.setPen(getPieceColor(avail[i], average));
         painter.drawPoint(i,0);
       }
+      pixmap = pix;
     }
     update();
     return average;