Bug fix with self's avatar