Fix id undefined