Last sort fix for today