Fixing [JACKSON-889]