Try and fix the query builder once more.