diff --git a/src/java/org/apache/lucene/search/Query.java b/src/java/org/apache/lucene/search/Query.java
index 1d4ae35bb8b..6e08fde4bbe 100644
--- a/src/java/org/apache/lucene/search/Query.java
+++ b/src/java/org/apache/lucene/search/Query.java
@@ -105,7 +105,7 @@ public abstract class Query implements java.io.Serializable, Cloneable {
    */
   // TODO (3.0): change to throw UnsupportedOperationException.
   public QueryWeight createQueryWeight(Searcher searcher) throws IOException {
-    return new QueryWeightWrapper(weight(searcher));
+    return new QueryWeightWrapper(createWeight(searcher));
   }
 
   /**