Fixed #35, Baseline is ordered again.