Fix for thruDate handling