fix time issues