Fix an issue with the previous commit related to inclusion of attributes.