fix issue with unique id