fix the time issue