fix for sometimes slow avatar
Merge pull request #2611 from AndrewMeadows/avatar-speed

fix for sometimes slow avatar