Fix #3 - Avatar properly formed