Fixed id bug