Fixed another issue with holiday date calculation