fixing time issue2