fixing date time issues