Fixing get_avatar