Fixed the list order