Fixing uniquify.