Fixed bug in EDM conversion with timestamps