diff --git a/src/piece_picker.cpp b/src/piece_picker.cpp
index f78133cce..8eb79b149 100755
--- a/src/piece_picker.cpp
+++ b/src/piece_picker.cpp
@@ -1575,9 +1575,15 @@ namespace libtorrent
 			assert(i->writing >= 0);
 			++i->finished;
 			if (info.state == block_info::state_writing)
+			{
 				--i->writing;
-			info.state = block_info::state_finished;
-			sort_piece(i);
+				info.state = block_info::state_finished;
+			}
+			else
+			{
+				info.state = block_info::state_finished;
+				sort_piece(i);
+			}
 		}
 	}