Time format problem fix again