Fix for json date serialization