Fix bug with missing id.