fixed id bug