Fixing primary character selection issue