fix the id bug