fix avatar choice