Completion id bug fix