diff --git a/src/BufferView2.C b/src/BufferView2.C
index 6072b45483..15f94713bb 100644
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -650,9 +650,10 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
 {
 	// Check if the label 'from' appears more than once
 	vector<string> labels = buffer()->getLabelList();
-	// count is broken on some systems, so use the HP version
-	int res;
-	count(labels.begin(), labels.end(), from, res);
+	// count is broken on some systems, so use the HP version (anon)
+	// Which does not exist on certain systems, so _we_
+	// use the standard version. (Lgb)
+	int res = count(labels.begin(), labels.end(), from);
 	if (res > 1)
 		return false;
 
diff --git a/src/ChangeLog b/src/ChangeLog
index b23fdf97a7..9e279e1d0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-14  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* BufferView2.C (ChangeRefsIfUnique): use standard version of
+	count.
+
 2002-01-13  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* bufferlist.C (readFile): create the buffer _after_ checking that