fix time resolve bug