Issue234

for after release, this is a proposed fix for #issue 234