Handle date format #7