Fixed date/time bug