Fix to avatar selector