Fix attrs_order