unbreak avatar catching