Issue #21628: Fixed issue with due date calculation