fixing time issue