Try to fix the 'tomorrow' handling.