Fix duplicate entries