Change avatar fixed issues