Merge fix for #234 into 3.2.x branch