fixed time issue