fix time issue again