This doesn't seem like it has anything to do with avatars. but hey, it's a good fix.