Next step towards correct avatar handling.