updated to fix avatars glitch