Fix time issue