fix avatar count, HandData crash (closes #1754)
Merge pull request #1755 from birarda/master

fix for HandData crash