Fixed avatar change bug