Fixed avatars
Merge