Fix iterator loosing wrapper issue