Fix repeat problem