Fixed avatar bug