fix unique field order for #13