Fix solution ordering