fixed iterator exception