Fix for RemoveAvatar not working