fixing time issue... again