EntityCollection::current() fix