Fix wrong avatar showing