fix time issue?