better duplicate fix
better duplicate fix