One fix related to #358 to also resolve related case of Iterator