Fix GetShardIterator bug 

This is a version of @ozataman's fix from #3 which isolates the semantic changes.