Fix avatar classes
Merge pull request #966 from roots/avatar_fix

Fix avatar classes