+ fix issue with the avatar
+ maybe fix the issue with the history?