Fixed ResultSetBuilder