fixed dublicates system