Fix for #256

xref #256