Fix issue with attributes overrides