add check if id is set