Really fixed remove duplicate entries