merge in id bug fix