...
backport #346 fix for 2.2.4