Avatar fix
Merge