Fix ordering of attributes