Fix avatar issue