correction from the review from master branch
sorting list