Fixed another case where no elements are returned