fixing duplicate issues