fixed related fields support