Hot fix for avatars