[master] Fixed strategy and recognized agent selection