Fix the unability of removing the avatar bug