Bug fix for player avatar helper