Fix [JACKSON-891] in this project as well (from 2.1.5)