Fix avatar problem