Really fix and simplify AvatarManager ;-)