Fixed time sorting issue, for good