Fixed issue with holiday date calculation