Fixed query #6