Fix avatar handling