Fixes #1228 Broken avatars

Fixes #1228 Broken avatars