Fix regression around <<Attributes>>