for patch v71459

Convert from custom to avatar factory