Fixing date and time issue #23