date mess fix