Fix Time encoding