fix avatar related