Fix for evaluation of clustering on the db create step