Merge of fix for #255 into 3.2.x branch