Fix date/time bug