#137 Keep the ordering of the sections