Fixed avatar clearing