Fixed issue with unique id