added missing id field
merged upstream