fix bug with constant avatar kill adds
Merge pull request #1045 from birarda/data-server

fix bug with constant avatar kill/adds