fix for UntilDate