Part 2 of Webview Avatar fix