#675 Fix avatar bug