Time display issue, rebased for 1.8dev