fixed time issue bug