diff --git a/src/TextMetrics.C b/src/TextMetrics.C
index 9b9876d3b7..85a90529b6 100644
--- a/src/TextMetrics.C
+++ b/src/TextMetrics.C
@@ -85,18 +85,16 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row)
 
 int numberOfHfills(Paragraph const & par, Row const & row)
 {
-	pos_type last = row.endpos();
+	pos_type const last = row.endpos();
 	pos_type first = row.pos();
-	pos_type const par_size = par.size();
 
 	// hfill *DO* count at the beginning of paragraphs!
 	if (first) {
-		while (first < last && first < par_size && par.isHfill(first))
+		while (first < last && par.isHfill(first))
 			++first;
 	}
 
 	first = max(first, par.beginOfBody());
-	last = min(last, par_size);
 
 	int n = 0;
 	for (pos_type p = first; p < last; ++p) {