Fixed premature end of iterator for single entry and zero-rank datasets