Backport #47 fix for 2.3.4