Fix issue with JsonSerializer