Date+1 bug finally fixed (hopefully)