Fix Time format problem