make avatar issue better