Fixing duplicate issue