Fixing ordering of the list