Fix issue with ObjectMapper