Uniq fix