Fix time decoding