Merge fix for #193 into brach 3.2.x