fixed iterator issue #15