Fixed avatar issue