Fixed bug with list order