Fix for changes to Iterable