Merge fix for #237 into branch 3.2.x (no tests)