Fixed bug related to uniqueId