Fix remove duplicate entries