Fixed behaviour of the Time class