fixing AVATAR handling (issue #233)