Fixed avatar selection