Use correct unique id