Backport #42 fix in 2.3.5
...