Make it work across days.
Merge the fix for failure to work across days.