Fix millisecond issue