Fixed a uniqueness issue