Fixed iterator sizes as pointed out in GitHub issue #39