Small patch sent on Query.cc