Add FieldAut logic to 2A type + small bugfix