Fixed next day time issue