Fix the handling of attributes: