Fix potential bug with player names