Fix for #270