Fix bugs of "Avatar"