Fixed bug causing iterator to restart incorrectly at rewind refs #69