Fix zulu time replacement