Fixes #1228 Broken avatars