Fixing Jackson support - issue#7