Resolved iterator error. Fixes #67