fixes date and time issues
fixes date and time issues