Fixed unique id related issue