Fix case where id is 0