Fixed for Sort time