avatars fix (again)