Fixing unable to change change avatar in some scenarios