Id field (without annotation) bug fix