Fixed next day behaviour