Really fixes iteration completion