fix order of avatar