Fix for avatar