Fixed time issue