removed previous fix for sorting: Seems to work without