Potential fix for loss of timezone when date contains milliseconds