Fix order solver