Fixes #232
3.`1.8.x