Fix for #281