fixed on flict