diff --git a/libtransmission/peerutils.h b/libtransmission/peerutils.h
index b110230a4..b7b5168dc 100644
--- a/libtransmission/peerutils.h
+++ b/libtransmission/peerutils.h
@@ -39,6 +39,7 @@ static tr_peer_t * peerInit()
     peer->date        = tr_date();
     peer->keepAlive   = peer->date;
     peer->download    = tr_rcInit();
+    peer->upload      = tr_rcInit();
 
     return peer;
 }
diff --git a/libtransmission/transmission.c b/libtransmission/transmission.c
index 73f22b059..643eb303b 100644
--- a/libtransmission/transmission.c
+++ b/libtransmission/transmission.c
@@ -591,11 +591,11 @@ tr_peer_stat_t * tr_torrentPeers( tr_torrent_t * tor, int * peerCount )
             
             if( ( peers[i].isDownloading = tr_peerIsDownloading( peer ) ) )
             {
-                peers[i].downloadRate  = tr_peerDownloadRate( peer );
+                peers[i].uploadToRate = tr_peerUploadRate( peer );
             }
             if( ( peers[i].isUploading = tr_peerIsUploading( peer ) ) )
             {
-                peers[i].uploadRate  = tr_peerUploadRate( peer );
+                peers[i].downloadFromRate = tr_peerDownloadRate( peer );
             }
         }
     }
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index dfbeefa71..ebc231098 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -398,8 +398,8 @@ struct tr_peer_stat_s
     
     int     isDownloading;
     int     isUploading;
-    float   downloadRate;
-    float   uploadRate;
+    float   downloadFromRate;
+    float   uploadToRate;
 };
 
 struct tr_msg_list_s