fix Iterator