Fix id bug again