diff --git a/src/Tools/Db.ts b/src/Tools/Db.ts
index 59dc84fb..15acd260 100755
--- a/src/Tools/Db.ts
+++ b/src/Tools/Db.ts
@@ -15,7 +15,7 @@
 
 import { Config } from '@Base/config';
 
-import { MongoClient, Db } from 'mongodb';
+import { MongoClient, Db, FilterQuery } from 'mongodb';
 
 import deepmerge from 'deepmerge';
 
@@ -172,8 +172,8 @@ export async function deleteOne(pCollection: string, pCriteria: CriteriaFilter):
 // Return a count of the documents that match the passed filter
 export async function countObjects(pCollection: string,
                                   pFilter: CriteriaFilter): Promise<number> {
-  Logger.cdebug('db-query-detail', `Db.countObjects: collection=${pCollection}, criteria=${JSON.stringify(pFilter.criteriaParameters)}`);
-  return await Datab.collection(pCollection).countDocuments(pFilter);
+  Logger.cdebug('db-query-detail', `Db.countObjects: collection=${pCollection}, criteria=${JSON.stringify(pFilter.criteriaParameters())}`);
+  return Datab.collection(pCollection).countDocuments(pFilter.criteriaParameters() as FilterQuery<any>);
 };
 
 // Low level generator to a stream of objects fitting a criteria.