Starting to fix [JACKSON-756]

2 files changed