fix: use compatible iterator types for the base types

fix: use compatible iterator types for the base types #1617