Customer B date and M date fix