Fix Comment fetching order