fixed the time issue