diff --git a/AUTHORS b/AUTHORS
index ace087242..6ce674025 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,19 @@
 
-Written by Arvid Norberg. Copyright (c) 2003-2006
+Written by Arvid Norberg. Copyright (c) 2003-2007
 
-Contributions by Magnus Jonsson, Daniel Wallin and Cory Nelson
+Lots of testing, suggestions and contributions by:
+Massaroddel
+Tianhao Qiu.
 
-Lots of testing, suggestions and contributions by Massaroddel and Tianhao Qiu.
+Contributions by:
+Magnus Jonsson
+Daniel Wallin
+Cory Nelson
+Stas Khirman
 
-Big thanks to Michael Wojciechowski and Peter Koeleman for making the
-autotools scripts.
+Building and maintainance of the autotools scripts:
+Michael Wojciechowski
+Peter Koeleman
 
 Thanks to Reimond Retz for bugfixes, suggestions and testing
 
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index de060693d..1d768b1fa 100755
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1182,7 +1182,8 @@ namespace libtorrent
 			if (it == m_request_queue.end()) return;
 			m_request_queue.erase(it);
 			
-			m_policy->block_finished(*this, block);
+			policy& pol = t->get_policy();
+			pol.block_finished(*this, block);
 			send_block_requests();
 			// since we found it in the request queue, it means it hasn't been
 			// sent yet, so we don't have to send a cancel.
@@ -1207,7 +1208,8 @@ namespace libtorrent
 
 		write_cancel(r);
 
-		m_policy->block_finished(*this, block);
+		policy& pol = t->get_policy();
+		pol.block_finished(*this, block);
 		send_block_requests();
 
 #ifdef TORRENT_VERBOSE_LOGGING