SN-35 Fix bug with id