Finish avatar handling (fix #128)