Alternative fix for RestIterator issue

Issue #28