Fixed dropped values and improper generator iteration