Tomorrow bug fix