Should correctly preserve player's selection