Fix bug due to 'id'-handling change