diff --git a/test/yulPhaser/Population.cpp b/test/yulPhaser/Population.cpp
index 1b8e76da0..c4b127888 100644
--- a/test/yulPhaser/Population.cpp
+++ b/test/yulPhaser/Population.cpp
@@ -81,20 +81,24 @@ BOOST_AUTO_TEST_CASE(isFitter_should_return_false_for_identical_individuals)
 	BOOST_TEST(!isFitter(Individual{Chromosome("acT"), 0}, Individual{Chromosome("acT"), 0}));
 }
 
-BOOST_FIXTURE_TEST_CASE(constructor_should_copy_chromosomes_and_compute_fitness, PopulationFixture)
+BOOST_FIXTURE_TEST_CASE(constructor_should_copy_chromosomes_compute_fitness_and_sort_chromosomes, PopulationFixture)
 {
 	vector<Chromosome> chromosomes = {
 		Chromosome::makeRandom(5),
+		Chromosome::makeRandom(15),
 		Chromosome::makeRandom(10),
 	};
 	Population population(m_fitnessMetric, chromosomes);
 
-	BOOST_TEST(population.individuals().size() == 2);
-	BOOST_TEST(population.individuals()[0].chromosome == chromosomes[0]);
-	BOOST_TEST(population.individuals()[1].chromosome == chromosomes[1]);
+	vector<Individual> const& individuals = population.individuals();
 
-	BOOST_TEST(population.individuals()[0].fitness == m_fitnessMetric->evaluate(population.individuals()[0].chromosome));
-	BOOST_TEST(population.individuals()[1].fitness == m_fitnessMetric->evaluate(population.individuals()[1].chromosome));
+	BOOST_TEST(individuals.size() == 3);
+	BOOST_TEST(individuals[0].fitness == 5);
+	BOOST_TEST(individuals[1].fitness == 10);
+	BOOST_TEST(individuals[2].fitness == 15);
+	BOOST_TEST(individuals[0].chromosome == chromosomes[0]);
+	BOOST_TEST(individuals[1].chromosome == chromosomes[2]);
+	BOOST_TEST(individuals[2].chromosome == chromosomes[1]);
 }
 
 BOOST_FIXTURE_TEST_CASE(makeRandom_should_get_chromosome_lengths_from_specified_generator, PopulationFixture)
diff --git a/tools/yulPhaser/Population.cpp b/tools/yulPhaser/Population.cpp
index d258fbf3d..923e75e6a 100644
--- a/tools/yulPhaser/Population.cpp
+++ b/tools/yulPhaser/Population.cpp
@@ -128,8 +128,8 @@ void Population::doMutation()
 
 void Population::doSelection()
 {
-	m_individuals = sortedIndividuals(move(m_individuals));
 	randomizeWorstChromosomes(*m_fitnessMetric, m_individuals, m_individuals.size() / 2);
+	m_individuals = sortedIndividuals(move(m_individuals));
 }
 
 void Population::randomizeWorstChromosomes(
diff --git a/tools/yulPhaser/Population.h b/tools/yulPhaser/Population.h
index 0dbac3235..bd58c397a 100644
--- a/tools/yulPhaser/Population.h
+++ b/tools/yulPhaser/Population.h
@@ -65,8 +65,7 @@ bool isFitter(Individual const& a, Individual const& b);
  * and selecting the best ones for the next round.
  *
  * An individual is a sequence of optimiser steps represented by a @a Chromosome instance.
- * Individuals are stored together with a fitness value that can be computed by the fitness metric
- * associated with the population.
+ * Individuals are always ordered by their fitness (based on @_fitnessMetric and @a isFitter()).
  * The fitness is computed using the metric as soon as an individual is inserted into the population.
  */
 class Population
@@ -112,7 +111,7 @@ public:
 private:
 	explicit Population(std::shared_ptr<FitnessMetric const> _fitnessMetric, std::vector<Individual> _individuals):
 		m_fitnessMetric(std::move(_fitnessMetric)),
-		m_individuals{std::move(_individuals)} {}
+		m_individuals{sortedIndividuals(std::move(_individuals))} {}
 
 	void doMutation();
 	void doSelection();