times near midnight now handled properly