I get same behavior with and without these changes. I think that check is done by if (!o1->time || !o2->time)