Fixing bug with timeField and timestamp replacement